Skip to content

Commit

Permalink
Merge branch 'fix/camera-rig-errors' into feature/icosahedron-shape
Browse files Browse the repository at this point in the history
  • Loading branch information
andybak committed Jun 27, 2024
2 parents a468f2b + 9ad6087 commit 77e515d
Show file tree
Hide file tree
Showing 14 changed files with 66,629 additions and 60,926 deletions.
9 changes: 9 additions & 0 deletions Assets/Models/Meshes.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

130 changes: 130 additions & 0 deletions Assets/Models/Meshes/Cone.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!43 &4300000
Mesh:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: Cone
serializedVersion: 8
m_SubMeshes:
- serializedVersion: 2
firstByte: 0
indexCount: 114
topology: 0
firstVertex: 0
vertexCount: 41
localAABB:
m_Center: {x: -0.00000008940697, y: -0.000000029802322, z: -0.0000003427267}
m_Extent: {x: 0.49999997, y: 0.5000001, z: 0.5}
m_Shapes:
vertices: []
shapes: []
channels: []
fullWeights: []
m_BindPose: []
m_BoneNameHashes:
m_RootBoneNameHash: 0
m_MeshCompression: 0
m_IsReadable: 1
m_KeepVertices: 1
m_KeepIndices: 1
m_IndexBuffer: 00000100020002000300000002000400030004000500030004000600050006000700050006000800070008000900070008000a0009000a000b0009000a000c000b000c000d000b000c000e000d000e000f000d000e0010000f00100011000f00100012001100120013001100140015001600140017001500140018001700140016001900140019001a0014001a001b0014001b001c0014001c001d0014001d001e0014001e001f0014001f002000140020002100140021002200140022002300140023002400140024002500140025002600140026002700140027002800140028001800
m_Skin: []
m_VertexData:
m_CurrentChannels: 139
m_VertexCount: 41
m_Channels:
- stream: 0
offset: 0
format: 0
dimension: 3
- stream: 0
offset: 12
format: 0
dimension: 3
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 0
offset: 24
format: 0
dimension: 2
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 0
offset: 32
format: 0
dimension: 4
m_DataSize: 1968
_typelessdata: 77371ebe020000bf7f78f3be00000000000080bf00000000f84a953ee4bb1e3f22d97cbf00000000a63020be000080bfca11c933020000bf060000bf00000000000080bf00000000e6fa6c3eceba193f22d97cbf00000000a83020be000080bf84371e3e020000bf7b78f3be00000000000080bf000000003c342c3ecdba193f1ed97cbf00000000063120be000080bf1a7996be020000bfcb1bcfbe00000000000080bf00000000cb7eaf3ea940283f1dd97cbf00000000233120be000080bf1d79963e020000bfc31bcfbe00000000000080bf000000008132dd3ddfbb1e3f1ed97cbf00000000f73020be000080bfc01bcfbe000000bf257996be00000000000080bf000000004888c23e905a353f1dd97cbf00000000223120be000080bfc11bcf3e000000bf1d7996be00000000000080bf000000006ec6683d9e40283f21d97cbf00000000b73020be000080bf7378f3be000000bf93371ebe00000000000080bf000000006a8acc3e4cc1443f20d97cbf00000000ce3020be000080bf7278f33e000000bf77371ebe00000000000080bf0000000066f4a03c875a353f24d97cbf000000006f3020be000080bf010000bf000000bf2d44b4b400000000000080bf00000000688acc3ef3f2543f22d97cbf00000000963020be000080bffcffff3e010000bf4cefee3300000000000080bf00000000a2a1d1384cc1443f25d97cbf00000000463020be000080bf7478f3be000000bf61371e3e00000000000080bf000000004488c23eb159643f24d97cbf00000000663020be000080bf6878f33e000000bf85371e3e00000000000080bf00000000a2a1d138f6f2543f26d97cbf00000000393020be000080bfc01bcfbefeffffbe0c79963e00000000000080bf00000000c37eaf3e9b73713f26d97cbf000000003d3020be000080bfae1bcf3effffffbe1d79963e00000000000080bf0000000066f4a03cb859643f26d97cbf00000000363020be000080bf1b7996befeffffbeb11bcf3e00000000000080bf00000000f64a953e5bf87a3f25d97cbf00000000573020be000080bf0379963efdffffbebe1bcf3e00000000000080bf0000000064c6683da173713f29d97cbf00000000f72f20be000080bf7e371ebefeffffbe6578f33e00000000000080bf00000000e9fa6c3e70f97f3f27d97cbf00000000143020be000080bf47371e3efdffffbe6c78f33e00000000000080bf000000007e32dd3d61f87a3f29d97cbf00000000ec2f20be000080bfcdcc94b3feffffbef5ffff3e00000000000080bf0000000044342c3e73f97f3f2cd97cbf00000000a92f20be000080bf0000c0b30100003fe9dd15b5000000000000803f0000000041b4993e3fb4993eef04353f00000000f704353f000080bf0379963efdffffbebe1bcf3e4296063f33f9e43e553e393fb1ad193f650ab23e5687a33e906664bf2382a33e000080bfae1bcf3effffffbe1d79963e423e393f2ef9e43e5d96063fb4ad193f385e813e1c82a33e926664bf5187a33e000080bf47371e3efdffffbe6c78f33e4a838d3e35f9e43e44c4593f7d28123faf54e03e6a91b13ef2345fbf9bffb03e000080bfcdcc94b3feffffbef5ffff3e0000000032f9e43e2df9643f91da033f8bda033f1a5dd33e468d50bf4b8dd03e000080bf6878f33e000000bf85371e3e3cc4593f30f9e43e81838d3e8428123fd627263e96ffb03ef9345fbf4d91b13e000080bffcffff3e010000bf4cefee332ef9643f2cf9e43e000000008fda033f94cdae3d488dd03e4a8d50bf0d5dd33e000080bf7278f33e000000bf77371ebe47c4593f2cf9e43e48838dbe9454e03ebe77f13cc1c8053fd27529bfbe8d093f000080bfc11bcf3e000000bf1d7996be513e393f2df9e43e4a9606bf490ab23ea2a1d138d3f22b3f76d38fbe867e2f3f000080bf1d79963e020000bfc31bcfbe5796063f26f9e43e493e39bf2e5e813ea2a1d138587e2f3febd38f3ee8f22b3f000080bf84371e3e020000bf7b78f3be77838d3e28f9e43e40c459bfb527263e3e78f13c968d093fe775293fd0c8053f000080bfca11c933020000bf060000bf0000000028f9e43e30f964bf7bcdae3db8cdae3d055dd33e4c8d503f458dd03e000080bf77371ebe020000bf7f78f3be5f838dbe2af9e43e44c459bfdc77f13ccb27263e4691b13efa345f3f9affb03e000080bf1a7996be020000bfcb1bcfbe4f9606bf29f9e43e4e3e39bfa2a1d1383b5e813e3e87a33e9466643f2782a33e000080bfc01bcfbe000000bf257996be4c3e39bf29f9e43e529606bf92dcd138550ab23e1882a33e9366643f5187a33e000080bf7378f3be000000bf93371ebe42c459bf2cf9e43e66838dbe2078f13ca054e03e95ffb03ef8345f3f5291b13e000080bf010000bf000000bf2d44b4b42ef964bf2cf9e43e00000000aacdae3d8fda033f468dd03e488d503f165dd33e000080bf7478f3be000000bf61371e3e41c459bf30f9e43e63838d3ed427263e8228123fcbc8053fcd75293fbb8d093f000080bfc01bcfbefeffffbe0c79963e4d3e39bf30f9e43e4e96063f365e813eb3ad193fdaf22b3f93d38f3e787e2f3f000080bf1b7996befeffffbeb11bcf3e509606bf34f9e43e4b3e393f500ab23eb3ad193f727e2f3f9fd38fbedef22b3f000080bf7e371ebefeffffbe6578f33e69838dbe32f9e43e40c4593f9c54e03e8128123fa88d093fda7529bfcec8053f000080bf
m_CompressedMesh:
m_Vertices:
m_NumItems: 0
m_Range: 0
m_Start: 0
m_Data:
m_BitSize: 0
m_UV:
m_NumItems: 0
m_Range: 0
m_Start: 0
m_Data:
m_BitSize: 0
m_Normals:
m_NumItems: 0
m_Range: 0
m_Start: 0
m_Data:
m_BitSize: 0
m_Tangents:
m_NumItems: 0
m_Range: 0
m_Start: 0
m_Data:
m_BitSize: 0
m_Weights:
m_NumItems: 0
m_Data:
m_BitSize: 0
m_NormalSigns:
m_NumItems: 0
m_Data:
m_BitSize: 0
m_TangentSigns:
m_NumItems: 0
m_Data:
m_BitSize: 0
m_FloatColors:
m_NumItems: 0
m_Range: 0
m_Start: 0
m_Data:
m_BitSize: 0
m_BoneIndices:
m_NumItems: 0
m_Data:
m_BitSize: 0
m_Triangles:
m_NumItems: 0
m_Data:
m_BitSize: 0
m_UVInfo: 0
m_LocalAABB:
m_Center: {x: -0.00000008940697, y: -0.000000029802322, z: -0.0000003427267}
m_Extent: {x: 0.49999997, y: 0.5000001, z: 0.5}
m_MeshUsageFlags: 0
m_BakedConvexCollisionMesh:
m_BakedTriangleCollisionMesh:
m_MeshOptimized: 1
6 changes: 6 additions & 0 deletions Assets/Models/Meshes/Cone.asset.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

130 changes: 130 additions & 0 deletions Assets/Models/Meshes/CylinderTube.asset

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions Assets/Models/Meshes/CylinderTube.asset.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

130 changes: 130 additions & 0 deletions Assets/Models/Meshes/CylinderTubeThin.asset

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions Assets/Models/Meshes/CylinderTubeThin.asset.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

130 changes: 130 additions & 0 deletions Assets/Models/Meshes/Icosphere.asset

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions Assets/Models/Meshes/Icosphere.asset.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

130 changes: 130 additions & 0 deletions Assets/Models/Meshes/IcosphereSmall.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!43 &4300000
Mesh:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: IcosphereSmall
serializedVersion: 8
m_SubMeshes:
- serializedVersion: 2
firstByte: 0
indexCount: 60
topology: 0
firstVertex: 0
vertexCount: 60
localAABB:
m_Center: {x: 0, y: 0, z: -0.000000029802322}
m_Extent: {x: 0.44721246, y: 0.5, z: 0.42532}
m_Shapes:
vertices: []
shapes: []
channels: []
fullWeights: []
m_BindPose: []
m_BoneNameHashes:
m_RootBoneNameHash: 0
m_MeshCompression: 0
m_IsReadable: 1
m_KeepVertices: 1
m_KeepIndices: 1
m_IndexBuffer: 00000100020003000400050006000700080009000a000b000c000d000e000f0010001100120013001400150016001700180019001a001b001c001d001e001f0020002100220023002400250026002700280029002a002b002c002d002e002f0030003100320033003400350036003700380039003a003b00
m_Skin: []
m_VertexData:
m_CurrentChannels: 139
m_VertexCount: 60
m_Channels:
- stream: 0
offset: 0
format: 0
dimension: 3
- stream: 0
offset: 12
format: 0
dimension: 3
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 0
offset: 24
format: 0
dimension: 2
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 0
offset: 32
format: 0
dimension: 4
m_DataSize: 2880
_typelessdata: 00000000000000bf000000004d1940be3f6e4bbf74cd133f95d3253e0300003fd8617bbfa5d9293ecae3b9bd000080bf55820d3e5cf964be89c3d93e4d1940be3f6e4bbf74cd133f9fd4a53d0000803f70b378bf268c723ee591293c000080bfd83db9be5cf964be9695863e4d1940be3f6e4bbf74cd133f7b179f3e921b4f3f626a5dbf9710d33eaf9d923e000080bfd83db9be5cf964be9695863e97681bbf586e4bbf000000007b179f3e921b4f3f586e4bbf97681b3fe6179434000080bfd83db9be5ef964be969586be97681bbf586e4bbf0000000079179f3ec591433e586e4bbf97681b3fc5b28c34000080bf00000000000000bf0000000097681bbf586e4bbf0000000095d3253e0300003f576e4bbf97681b3fb5a0d633000080bf00000000000000bf000000005a74fb3e536e4bbf4db2b63e95d3253e0300003f05f55ebf0345e1be4120603e000080bf08f9e43e5df964be000000005a74fb3e536e4bbf4db2b63e000000000300003f40c459bf519606bf7d37a6b1000080bf55820d3e5cf964be89c3d93e5a74fb3e536e4bbf4db2b63e9fd4a53d0000803f77b05ebfc41ff0be7f7d1c3e000080bf00000000000000bf000000005b74fb3e546e4bbf47b2b6be95d3253e0300003f05f55ebf0845e1be302060be000080bf55820d3e5ef964be8cc3d9be5b74fb3e546e4bbf47b2b6bea3d4a53d9479163477b05ebfc81ff0be717d1cbe000080bf08f9e43e5df964be000000005b74fb3e546e4bbf47b2b6be000000000300003f40c459bf519606bf7c97ef31000080bf00000000000000bf00000000521940be406e4bbf74cd13bf95d3253e0300003fd8617bbfa4d9293edee3b93d000080bfd83db9be5ef964be969586be521940be406e4bbf74cd13bf79179f3ec591433e676a5dbf8e10d33ea09d92be000080bf55820d3e5ef964be8cc3d9be521940be406e4bbf74cd13bfa3d4a53d9479163470b378bf1d8c723eab9029bc000080bfd83db9be5cf964be9695863e7b747bbf621940be000000007b179f3e921b4f3f631940be7b747b3fab179434000080bf08f9e4be5df9643e000000b37b747bbf621940be000000006c45eb3efcffff3e611940be7b747b3f55178f34000080bfd83db9be5ef964be969586be7b747bbf621940be0000000079179f3ec591433e631940be7b747b3f8fb28c34000080bf55820d3e5cf964be89c3d93e00699bbe5e1740bede256f3f9fd4a53d0000803f39564abf3cdd183f07310cbe000080bf55820dbe5ef9643e8ac3d93e00699bbe5e1740bede256f3f4a5d0a3ffeff7f3f87ed38bef656793fa3300c3e000080bfd83db9be5cf964be9695863e00699bbe5e1740bede256f3f7b179f3e921b4f3fd79506bf8bc4593f91a61ab6000080bf08f9e43e5df964be00000000216e4b3fcd1640bed2cd133f6d456b3f0300003f83993ebec0047bbf44967fbd000080bfd83db93e5ef9643e9695863e216e4b3fcd1640bed2cd133f742e453f901b4f3f332594bc6d3c75bff59c92be000080bf55820d3e5cf964be89c3d93e216e4b3fcd1640bed2cd133f0000803f0000803fd512d2bd9c977abf751b35be000080bf55820d3e5ef964be8cc3d9be216e4b3fcb1640bed3cd13bf0000803f947916342713d2bd9e977abf3b1b353e000080bfd83db93e5cf9643e969586be216e4b3fcb1640bed3cd13bf742e453fbc91433e462694bc703c75bfdf9c923e000080bf08f9e43e5df964be00000000216e4b3fcb1640bed3cd13bf6d456b3f0300003f98993ebebf047bbfc3957f3d000080bfd83db9be5ef964be969586be08699bbe601740bedd256fbf79179f3ec591433ede9506bf87c4593f2d462e36000080bf55820dbe5cf9643e8cc3d9be08699bbe601740bedd256fbf4a5d0a3f00000000cfed38bef356793f8a300cbe000080bf55820d3e5ef964be8cc3d9be08699bbe601740bedd256fbfa3d4a53d947916343b564abf38dd183f1b310c3e000080bfd83db9be5cf964be9695863e226e4bbfd216403ed1cd133f7b179f3e921b4f3f9826943c703c753fdf9c92be000080bf55820dbe5ef9643e8ac3d93e226e4bbfd216403ed1cd133f4a5d0a3ffeff7f3f7af4633eea8f793fde7029bc000080bf08f9e4be5df9643e000000b3226e4bbfd216403ed1cd133f6c45eb3efcffff3e3ee2943e3dd5733f78e2b93d000080bf55820d3e5cf964be89c3d93e01699b3e5917403edf256f3f0000803f0000803fcaed383ef45679bf87300c3e000080bfd83db93e5ef9643e9695863e01699b3e5917403edf256f3f742e453f901b4f3fe195063f85c459bf133332b6000080bf55820dbe5ef9643e8ac3d93e01699b3e5917403edf256f3f4a5d0a3ffeff7f3f3e564a3f34dd18bf1a310cbe000080bf08f9e43e5df964be000000007b747b3f6219403e000000006d456b3f0300003f6219403e7b747bbf94bac4b4000080bfd83db93e5cf9643e969586be7b747b3f6219403e00000000742e453fbc91433e6319403e7b747bbf77f997b4000080bfd83db93e5ef9643e9695863e7b747b3f6219403e00000000742e453f901b4f3f6319403e7b747bbf9ea29cb4000080bf55820d3e5ef964be8cc3d9be08699b3e6017403edd256fbf0000803f947916348ced383ef55679bfa2300cbe000080bf55820dbe5cf9643e8cc3d9be08699b3e6017403edd256fbf4a5d0a3f0000000036564a3f3fdd18bf0f310c3e000080bfd83db93e5cf9643e969586be08699b3e6017403edd256fbf742e453fbc91433ed795063f8bc459bfc76b2136000080bfd83db9be5ef964be969586be206e4bbfcb16403ed4cd13bf79179f3ec591433e2f25943c6e3c753ff39c923e000080bf08f9e4be5df9643e000000b3206e4bbfcb16403ed4cd13bf6c45eb3efcffff3e37e2943e3fd5733f59e2b9bd000080bf55820dbe5cf9643e8cc3d9be206e4bbfcb16403ed4cd13bf4a5d0a3f0000000054f4633eec8f793fbe73293c000080bf55820dbe5ef9643e8ac3d93e5974fbbe546e4b3f47b2b63e4a5d0a3ffeff7f3f3bc4593f5996063fa871edb5000080bf000000000000003f000080b35974fbbe546e4b3f47b2b63e9b171f3ffaffff3e06f55e3f0545e13e3420603e000080bf08f9e4be5df9643e000000b35974fbbe546e4b3f47b2b63e6c45eb3efcffff3eed73483f150c153fd42060be000080bfd83db93e5ef9643e9695863e4d19403e406e4b3f72cd133f742e453f901b4f3f686a5d3f8b10d3be9d9d923e000080bf000000000000003f000080b34d19403e406e4b3f72cd133f9b171f3ffaffff3ed8617b3fa4d929becae3b9bd000080bf55820dbe5ef9643e8ac3d93e4d19403e406e4b3f72cd133f4a5d0a3ffeff7f3f71b3783f188c72bebc90293c000080bfd83db93e5cf9643e969586be97681b3f586e4b3f00000000742e453fbc91433e586e4b3f97681bbfb4f997b4000080bf000000000000003f000080b397681b3f586e4b3f000000009b171f3ffaffff3e576e4b3f97681bbf9bd95cb3000080bfd83db93e5ef9643e9695863e97681b3f586e4b3f00000000742e453f901b4f3f586e4b3f97681bbfd9a29cb4000080bf55820dbe5cf9643e8cc3d9be5319403e406e4b3f73cd13bf4a5d0a3f0000000070b3783f2c8c72bee79129bc000080bf000000000000003f000080b35319403e406e4b3f73cd13bf9b171f3ffaffff3ed8617b3facd929becbe3b93d000080bfd83db93e5cf9643e969586be5319403e406e4b3f73cd13bf742e453fbc91433e636a5d3f9710d3bead9d92be000080bf08f9e4be5df9643e000000b35b74fbbe536e4b3f4db2b6be6c45eb3efcffff3ee973483f170c153ff420603e000080bf000000000000003f000080b35b74fbbe536e4b3f4db2b6be9b171f3ffaffff3e05f55e3f0445e13e432060be000080bf55820dbe5cf9643e8cc3d9be5b74fbbe536e4b3f4db2b6be4a5d0a3f0000000039c4593f5c96063f307d0736000080bf
m_CompressedMesh:
m_Vertices:
m_NumItems: 0
m_Range: 0
m_Start: 0
m_Data:
m_BitSize: 0
m_UV:
m_NumItems: 0
m_Range: 0
m_Start: 0
m_Data:
m_BitSize: 0
m_Normals:
m_NumItems: 0
m_Range: 0
m_Start: 0
m_Data:
m_BitSize: 0
m_Tangents:
m_NumItems: 0
m_Range: 0
m_Start: 0
m_Data:
m_BitSize: 0
m_Weights:
m_NumItems: 0
m_Data:
m_BitSize: 0
m_NormalSigns:
m_NumItems: 0
m_Data:
m_BitSize: 0
m_TangentSigns:
m_NumItems: 0
m_Data:
m_BitSize: 0
m_FloatColors:
m_NumItems: 0
m_Range: 0
m_Start: 0
m_Data:
m_BitSize: 0
m_BoneIndices:
m_NumItems: 0
m_Data:
m_BitSize: 0
m_Triangles:
m_NumItems: 0
m_Data:
m_BitSize: 0
m_UVInfo: 0
m_LocalAABB:
m_Center: {x: 0, y: 0, z: -0.000000029802322}
m_Extent: {x: 0.44721246, y: 0.5, z: 0.42532}
m_MeshUsageFlags: 0
m_BakedConvexCollisionMesh:
m_BakedTriangleCollisionMesh:
m_MeshOptimized: 1
6 changes: 6 additions & 0 deletions Assets/Models/Meshes/IcosphereSmall.asset.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 77e515d

Please sign in to comment.