diff --git a/Assets/Models/Blender/Iron Man.blend b/Assets/Models/Blender/Iron Man.blend index e9788a7..877190b 100644 --- a/Assets/Models/Blender/Iron Man.blend +++ b/Assets/Models/Blender/Iron Man.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:602fec02a77759b61d80629c47f2e2d39902480ec39947792a5444a4f85d5469 -size 30165200 +oid sha256:f9bbc3dfc46af7b441306dc244ce156ccaa17fea15ce96dd422b60b200d98100 +size 2628348 diff --git a/Assets/Models/Blender/Iron Man.blend1 b/Assets/Models/Blender/Iron Man.blend1 new file mode 100644 index 0000000..9ba67fb Binary files /dev/null and b/Assets/Models/Blender/Iron Man.blend1 differ diff --git a/Assets/Models/Blender/Iron Man.blend1.meta b/Assets/Models/Blender/Iron Man.blend1.meta new file mode 100644 index 0000000..ed4b536 --- /dev/null +++ b/Assets/Models/Blender/Iron Man.blend1.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 997fb0365faa352448c4bf540a894bf6 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Blender/LegoDarthVader.blend b/Assets/Models/Blender/LegoDarthVader.blend index 2deaa14..02b6c66 100644 --- a/Assets/Models/Blender/LegoDarthVader.blend +++ b/Assets/Models/Blender/LegoDarthVader.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3ccfe8692b28b916b703875285fc24d7ce0dfac08d3320949f4c7f02627ceedb -size 1169236 +oid sha256:442be06998f4ea31ea633f3ced41a20c8d77ca175324458c8a8abbce7e8d257e +size 805836 diff --git a/Assets/Models/Blender/LegoDarthVader.blend1 b/Assets/Models/Blender/LegoDarthVader.blend1 new file mode 100644 index 0000000..3a50524 Binary files /dev/null and b/Assets/Models/Blender/LegoDarthVader.blend1 differ diff --git a/Assets/Models/Blender/LegoDarthVader.blend1.meta b/Assets/Models/Blender/LegoDarthVader.blend1.meta new file mode 100644 index 0000000..5320f47 --- /dev/null +++ b/Assets/Models/Blender/LegoDarthVader.blend1.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8be71a403a306084fa05a1bd52f0c83d +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Blender/LegoDeadPool.blend b/Assets/Models/Blender/LegoDeadPool.blend index 622399f..3f43b9c 100644 --- a/Assets/Models/Blender/LegoDeadPool.blend +++ b/Assets/Models/Blender/LegoDeadPool.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:50fbdd8bc8c6bb8d45947ebea647e23bdf49dab3167a827879f937236c7ca202 -size 2217060 +oid sha256:359126932b4f16b663c47bcf77f421b6edef3eaa0d423b45c8f366238fd9f166 +size 2179556 diff --git a/Assets/Models/Blender/LegoDeadPool.blend1 b/Assets/Models/Blender/LegoDeadPool.blend1 new file mode 100644 index 0000000..0b70ff4 Binary files /dev/null and b/Assets/Models/Blender/LegoDeadPool.blend1 differ diff --git a/Assets/Models/Blender/LegoDeadPool.blend1.meta b/Assets/Models/Blender/LegoDeadPool.blend1.meta new file mode 100644 index 0000000..cb98f31 --- /dev/null +++ b/Assets/Models/Blender/LegoDeadPool.blend1.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 071114ad6eab97647889154cb475219a +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Blender/batman.blend b/Assets/Models/Blender/batman.blend index f15744d..a369d2e 100644 --- a/Assets/Models/Blender/batman.blend +++ b/Assets/Models/Blender/batman.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:de922d9b74f439364fe05e288e08bca4af14aa01db42b3f0bccdefad698f9926 -size 1576100 +oid sha256:8d4e361ab34b81183793c4430a65daf8ef809eafdc0a93f3dd7db9c2d2dea104 +size 1603804 diff --git a/Assets/Models/Blender/batman.blend1 b/Assets/Models/Blender/batman.blend1 new file mode 100644 index 0000000..12a8f0b Binary files /dev/null and b/Assets/Models/Blender/batman.blend1 differ diff --git a/Assets/Models/Blender/batman.blend1.meta b/Assets/Models/Blender/batman.blend1.meta new file mode 100644 index 0000000..e32974e --- /dev/null +++ b/Assets/Models/Blender/batman.blend1.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8f47cf52770385d48ae56ff398b505b9 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Blender/venom.blend b/Assets/Models/Blender/venom.blend deleted file mode 100644 index 1dc51b9..0000000 --- a/Assets/Models/Blender/venom.blend +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8285a290a0989db631161394adc78909b4d99f191dfd8144ed7da62488ab8127 -size 1739916 diff --git a/Assets/Models/Blender/venom.blend.meta b/Assets/Models/Blender/venom.blend.meta deleted file mode 100644 index 05126b1..0000000 --- a/Assets/Models/Blender/venom.blend.meta +++ /dev/null @@ -1,106 +0,0 @@ -fileFormatVersion: 2 -guid: 699b7ae672c85904895c4ecac4fc7f90 -ModelImporter: - serializedVersion: 21300 - internalIDToNameTable: [] - externalObjects: {} - materials: - materialImportMode: 2 - materialName: 0 - materialSearch: 1 - materialLocation: 1 - animations: - legacyGenerateAnimations: 4 - bakeSimulation: 0 - resampleCurves: 1 - optimizeGameObjects: 0 - removeConstantScaleCurves: 1 - motionNodeName: - rigImportErrors: - rigImportWarnings: - animationImportErrors: - animationImportWarnings: - animationRetargetingWarnings: - animationDoRetargetingWarnings: 0 - importAnimatedCustomProperties: 0 - importConstraints: 0 - animationCompression: 1 - animationRotationError: 0.5 - animationPositionError: 0.5 - animationScaleError: 0.5 - animationWrapMode: 0 - extraExposedTransformPaths: [] - extraUserProperties: [] - clipAnimations: [] - isReadable: 0 - meshes: - lODScreenPercentages: [] - globalScale: 1 - meshCompression: 0 - addColliders: 0 - useSRGBMaterialColor: 1 - sortHierarchyByName: 1 - importVisibility: 1 - importBlendShapes: 1 - importCameras: 1 - importLights: 1 - nodeNameCollisionStrategy: 1 - fileIdsGeneration: 2 - swapUVChannels: 0 - generateSecondaryUV: 0 - useFileUnits: 1 - keepQuads: 0 - weldVertices: 1 - bakeAxisConversion: 0 - preserveHierarchy: 0 - skinWeightsMode: 0 - maxBonesPerVertex: 4 - minBoneWeight: 0.001 - optimizeBones: 1 - meshOptimizationFlags: -1 - indexFormat: 0 - secondaryUVAngleDistortion: 8 - secondaryUVAreaDistortion: 15.000001 - secondaryUVHardAngle: 88 - secondaryUVMarginMethod: 1 - secondaryUVMinLightmapResolution: 40 - secondaryUVMinObjectScale: 1 - secondaryUVPackMargin: 4 - useFileScale: 1 - tangentSpace: - normalSmoothAngle: 60 - normalImportMode: 0 - tangentImportMode: 3 - normalCalculationMode: 4 - legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 - blendShapeNormalImportMode: 1 - normalSmoothingSource: 0 - referencedClips: [] - importAnimation: 1 - humanDescription: - serializedVersion: 3 - human: [] - skeleton: [] - armTwist: 0.5 - foreArmTwist: 0.5 - upperLegTwist: 0.5 - legTwist: 0.5 - armStretch: 0.05 - legStretch: 0.05 - feetSpacing: 0 - globalScale: 1 - rootMotionBoneName: - hasTranslationDoF: 0 - hasExtraRoot: 0 - skeletonHasParents: 1 - lastHumanDescriptionAvatarSource: {instanceID: 0} - autoGenerateAvatarMappingIfUnspecified: 1 - animationType: 2 - humanoidOversampling: 1 - avatarSetup: 0 - addHumanoidExtraRootOnlyWhenUsingAvatar: 1 - remapMaterialsIfMaterialImportModeIsNone: 0 - additionalBone: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scenes/FabLab/FabLab.unity b/Assets/Scenes/FabLab/FabLab.unity index 008ff7a..056cf99 100644 --- a/Assets/Scenes/FabLab/FabLab.unity +++ b/Assets/Scenes/FabLab/FabLab.unity @@ -2509,56 +2509,56 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: e92f9591afc2acb49a7df53fc62910d0, type: 3} propertyPath: m_LocalScale.x - value: 0.054244008 + value: 0.0024630034 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: e92f9591afc2acb49a7df53fc62910d0, type: 3} propertyPath: m_LocalScale.y - value: 0.054244 + value: 0.002463003 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: e92f9591afc2acb49a7df53fc62910d0, type: 3} propertyPath: m_LocalScale.z - value: 0.054244008 + value: 0.0024630034 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: e92f9591afc2acb49a7df53fc62910d0, type: 3} propertyPath: m_LocalPosition.x - value: 1.4923244 + value: 1.299 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: e92f9591afc2acb49a7df53fc62910d0, type: 3} propertyPath: m_LocalPosition.y - value: 7.225353 + value: 7.205 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: e92f9591afc2acb49a7df53fc62910d0, type: 3} propertyPath: m_LocalPosition.z - value: -12.979918 + value: -12.959 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: e92f9591afc2acb49a7df53fc62910d0, type: 3} propertyPath: m_LocalRotation.w - value: 0.7071069 + value: 0.50000066 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: e92f9591afc2acb49a7df53fc62910d0, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: -0.49999937 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: e92f9591afc2acb49a7df53fc62910d0, type: 3} propertyPath: m_LocalRotation.y - value: -0.70710677 + value: -0.5000006 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: e92f9591afc2acb49a7df53fc62910d0, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: -0.49999943 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: e92f9591afc2acb49a7df53fc62910d0, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e92f9591afc2acb49a7df53fc62910d0, type: 3} - propertyPath: m_LocalEulerAnglesHint.y value: -90 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: e92f9591afc2acb49a7df53fc62910d0, type: 3} - propertyPath: m_LocalEulerAnglesHint.z + propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e92f9591afc2acb49a7df53fc62910d0, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -90 + objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: e92f9591afc2acb49a7df53fc62910d0, type: 3} propertyPath: m_Name value: LegoDarthVader @@ -10536,7 +10536,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh24406 + m_Name: pb_Mesh24410 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -10719,11 +10719,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: c114f2acd2cf17b46afd47f1a5aeca37, type: 3} propertyPath: m_LocalPosition.x - value: 1.528 + value: 1.4671 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: c114f2acd2cf17b46afd47f1a5aeca37, type: 3} propertyPath: m_LocalPosition.y - value: 6.617 + value: 6.6154 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: c114f2acd2cf17b46afd47f1a5aeca37, type: 3} propertyPath: m_LocalPosition.z @@ -10731,32 +10731,32 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: c114f2acd2cf17b46afd47f1a5aeca37, type: 3} propertyPath: m_LocalRotation.w - value: 0.7071068 + value: 0.5000008 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: c114f2acd2cf17b46afd47f1a5aeca37, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: -0.49999928 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: c114f2acd2cf17b46afd47f1a5aeca37, type: 3} propertyPath: m_LocalRotation.y - value: -0.70710677 + value: -0.5000007 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: c114f2acd2cf17b46afd47f1a5aeca37, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: -0.49999928 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: c114f2acd2cf17b46afd47f1a5aeca37, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c114f2acd2cf17b46afd47f1a5aeca37, type: 3} - propertyPath: m_LocalEulerAnglesHint.y value: -90 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: c114f2acd2cf17b46afd47f1a5aeca37, type: 3} - propertyPath: m_LocalEulerAnglesHint.z + propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c114f2acd2cf17b46afd47f1a5aeca37, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -90 + objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: c114f2acd2cf17b46afd47f1a5aeca37, type: 3} propertyPath: m_Name value: Iron Man @@ -10774,7 +10774,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh24358 + m_Name: pb_Mesh24362 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -16644,7 +16644,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh24492 + m_Name: pb_Mesh24496 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -18491,7 +18491,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh24014 + m_Name: pb_Mesh24018 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -18655,7 +18655,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh23816 + m_Name: pb_Mesh23820 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -18963,7 +18963,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh23960 + m_Name: pb_Mesh23964 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -27604,56 +27604,56 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 9ec9220eced66b242bbf76145f380cd4, type: 3} propertyPath: m_LocalScale.x - value: 0.054122843 + value: 0.0022679686 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 9ec9220eced66b242bbf76145f380cd4, type: 3} propertyPath: m_LocalScale.y - value: 0.054122843 + value: 0.0022679686 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 9ec9220eced66b242bbf76145f380cd4, type: 3} propertyPath: m_LocalScale.z - value: 0.054122843 + value: 0.0022679686 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 9ec9220eced66b242bbf76145f380cd4, type: 3} propertyPath: m_LocalPosition.x - value: 1.4353242 + value: 1.4842 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 9ec9220eced66b242bbf76145f380cd4, type: 3} propertyPath: m_LocalPosition.y - value: 6.753153 + value: 6.7391 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 9ec9220eced66b242bbf76145f380cd4, type: 3} propertyPath: m_LocalPosition.z - value: -13.169818 + value: -13.16 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 9ec9220eced66b242bbf76145f380cd4, type: 3} propertyPath: m_LocalRotation.w - value: 0.7071068 + value: 0.50007886 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 9ec9220eced66b242bbf76145f380cd4, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: -0.49992117 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 9ec9220eced66b242bbf76145f380cd4, type: 3} propertyPath: m_LocalRotation.y - value: -0.70710677 + value: -0.50007886 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 9ec9220eced66b242bbf76145f380cd4, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: -0.49992123 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 9ec9220eced66b242bbf76145f380cd4, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9ec9220eced66b242bbf76145f380cd4, type: 3} - propertyPath: m_LocalEulerAnglesHint.y value: -90 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 9ec9220eced66b242bbf76145f380cd4, type: 3} - propertyPath: m_LocalEulerAnglesHint.z + propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 9ec9220eced66b242bbf76145f380cd4, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -89.982 + objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: 9ec9220eced66b242bbf76145f380cd4, type: 3} propertyPath: m_Name value: batman @@ -28621,7 +28621,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh23934 + m_Name: pb_Mesh23938 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -29174,27 +29174,27 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: c36c92f1b28e29249b278c84d05d074c, type: 3} propertyPath: m_LocalScale.x - value: 0.45199 + value: 0.0048636543 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: c36c92f1b28e29249b278c84d05d074c, type: 3} propertyPath: m_LocalScale.y - value: 0.45199 + value: 0.0048636543 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: c36c92f1b28e29249b278c84d05d074c, type: 3} propertyPath: m_LocalScale.z - value: 0.45199 + value: 0.0048636543 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: c36c92f1b28e29249b278c84d05d074c, type: 3} propertyPath: m_LocalPosition.x - value: 1.5070243 + value: 1.4 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: c36c92f1b28e29249b278c84d05d074c, type: 3} propertyPath: m_LocalPosition.y - value: 6.208353 + value: 6.2499 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: c36c92f1b28e29249b278c84d05d074c, type: 3} propertyPath: m_LocalPosition.z - value: -12.948928 + value: -12.95 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: c36c92f1b28e29249b278c84d05d074c, type: 3} propertyPath: m_LocalRotation.w @@ -32592,7 +32592,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh24516 + m_Name: pb_Mesh24524 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 diff --git a/Assets/Scenes/FabLab/FabLab/ReflectionProbe-0.png b/Assets/Scenes/FabLab/FabLab/ReflectionProbe-0.png index 1e45201..9bb486b 100644 --- a/Assets/Scenes/FabLab/FabLab/ReflectionProbe-0.png +++ b/Assets/Scenes/FabLab/FabLab/ReflectionProbe-0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c65b0e6eed79689864f9e841f6686375b1e3750c7ef505f5c782a8dbd661eb0d -size 104452 +oid sha256:3cb322e677c5604173a1f194b6c1189ee6cddbc856b1515942c4c489ae4764ed +size 102931