diff --git a/Assets/Models/Blender/Warrok W Kurniawan.fbx b/Assets/Models/Blender/Warrok W Kurniawan.fbx new file mode 100644 index 0000000..44e810c Binary files /dev/null and b/Assets/Models/Blender/Warrok W Kurniawan.fbx differ diff --git a/Assets/Models/Blender/Warrok W Kurniawan.fbx.meta b/Assets/Models/Blender/Warrok W Kurniawan.fbx.meta new file mode 100644 index 0000000..8e8578a --- /dev/null +++ b/Assets/Models/Blender/Warrok W Kurniawan.fbx.meta @@ -0,0 +1,106 @@ +fileFormatVersion: 2 +guid: 92c63a11a41e3234fbc58d675d308a99 +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/Models/Blender/WindowUK.blend b/Assets/Models/Blender/WindowUK.blend index 7298897..bf1e480 100644 --- a/Assets/Models/Blender/WindowUK.blend +++ b/Assets/Models/Blender/WindowUK.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:78eff9ae9b80a60f00248ba6aab7964ce7e9fa831d28a1095875c8a8c5810ab6 -size 1481876 +oid sha256:05cfe4a95afe905e6464596039b94dfe52e400c4dafc385d75559162649cad59 +size 1559344 diff --git a/Assets/Models/Blender/WindowUK.blend.meta b/Assets/Models/Blender/WindowUK.blend.meta index 9cab6ed..e705fa9 100644 --- a/Assets/Models/Blender/WindowUK.blend.meta +++ b/Assets/Models/Blender/WindowUK.blend.meta @@ -3,7 +3,17 @@ guid: bc2effa48845a644e9d3a70ee743cba2 ModelImporter: serializedVersion: 21300 internalIDToNameTable: [] - externalObjects: {} + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Plastic + second: {fileID: 7576386722563338562, guid: 5ade54c247559a342b46db33bb0c5fdf, type: 3} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: glass + second: {fileID: 2100000, guid: e7f8455d46288cb12b49d5367b543018, type: 2} materials: materialImportMode: 2 materialName: 0 diff --git a/Assets/Models/Blender/WindowUK.blend1 b/Assets/Models/Blender/WindowUK.blend1 new file mode 100644 index 0000000..56b06c3 Binary files /dev/null and b/Assets/Models/Blender/WindowUK.blend1 differ diff --git a/Assets/Models/Blender/WindowUK.blend1.meta b/Assets/Models/Blender/WindowUK.blend1.meta new file mode 100644 index 0000000..5cdfcdc --- /dev/null +++ b/Assets/Models/Blender/WindowUK.blend1.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0c7c8ba900363824fb339d9d56fa812c +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Blender/assets.meta b/Assets/Models/Blender/assets.meta new file mode 100644 index 0000000..4c94b7a --- /dev/null +++ b/Assets/Models/Blender/assets.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e60874ecef3bc3b44bb39ad08f11abd5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Blender/assets/materials.meta b/Assets/Models/Blender/assets/materials.meta new file mode 100644 index 0000000..6f89200 --- /dev/null +++ b/Assets/Models/Blender/assets/materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3de122f9046c0bc44b615c68031090d2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Blender/assets/materials/window_glass_585ed301-8638-4745-95fe-5925d33d192a.meta b/Assets/Models/Blender/assets/materials/window_glass_585ed301-8638-4745-95fe-5925d33d192a.meta new file mode 100644 index 0000000..b012755 --- /dev/null +++ b/Assets/Models/Blender/assets/materials/window_glass_585ed301-8638-4745-95fe-5925d33d192a.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 39adff91ca7ee8a41a2d94a847bc55e5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Blender/assets/materials/window_glass_585ed301-8638-4745-95fe-5925d33d192a/window_glass_2fbd8526-733d-440b-9ee9-a7aedcd28ca4.blend b/Assets/Models/Blender/assets/materials/window_glass_585ed301-8638-4745-95fe-5925d33d192a/window_glass_2fbd8526-733d-440b-9ee9-a7aedcd28ca4.blend new file mode 100644 index 0000000..9893238 --- /dev/null +++ b/Assets/Models/Blender/assets/materials/window_glass_585ed301-8638-4745-95fe-5925d33d192a/window_glass_2fbd8526-733d-440b-9ee9-a7aedcd28ca4.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f246ce8a42a4a6ab3aed5ff345b4de84922a589bd8c7a2896e052c8073b8d097 +size 54754 diff --git a/Assets/Models/Blender/assets/materials/window_glass_585ed301-8638-4745-95fe-5925d33d192a/window_glass_2fbd8526-733d-440b-9ee9-a7aedcd28ca4.blend.meta b/Assets/Models/Blender/assets/materials/window_glass_585ed301-8638-4745-95fe-5925d33d192a/window_glass_2fbd8526-733d-440b-9ee9-a7aedcd28ca4.blend.meta new file mode 100644 index 0000000..6e5f2f0 --- /dev/null +++ b/Assets/Models/Blender/assets/materials/window_glass_585ed301-8638-4745-95fe-5925d33d192a/window_glass_2fbd8526-733d-440b-9ee9-a7aedcd28ca4.blend.meta @@ -0,0 +1,106 @@ +fileFormatVersion: 2 +guid: 61465c80f6c431546a8885c50e11733b +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 e990d06..375a4d8 100644 --- a/Assets/Scenes/FabLab/FabLab.unity +++ b/Assets/Scenes/FabLab/FabLab.unity @@ -5760,6 +5760,8 @@ Transform: m_Children: - {fileID: 1378541949} - {fileID: 363747407} + - {fileID: 899232842} + - {fileID: 497015422} m_Father: {fileID: 45957245} m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -8171,6 +8173,80 @@ Transform: m_CorrespondingSourceObject: {fileID: 3674349604157782260, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} m_PrefabInstance: {fileID: 472164267} m_PrefabAsset: {fileID: 0} +--- !u!1001 &497015421 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 146814758} + m_Modifications: + - target: {fileID: 7101811468694509626, guid: cbdff3e37c153cc48b95d4374a38eed9, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7101811468694509626, guid: cbdff3e37c153cc48b95d4374a38eed9, type: 3} + propertyPath: m_LocalScale.x + value: 1.6521715 + objectReference: {fileID: 0} + - target: {fileID: 7101811468694509626, guid: cbdff3e37c153cc48b95d4374a38eed9, type: 3} + propertyPath: m_LocalScale.y + value: 1.6521735 + objectReference: {fileID: 0} + - target: {fileID: 7101811468694509626, guid: cbdff3e37c153cc48b95d4374a38eed9, type: 3} + propertyPath: m_LocalScale.z + value: 1.6521724 + objectReference: {fileID: 0} + - target: {fileID: 7101811468694509626, guid: cbdff3e37c153cc48b95d4374a38eed9, type: 3} + propertyPath: m_LocalPosition.x + value: -0.10511969 + objectReference: {fileID: 0} + - target: {fileID: 7101811468694509626, guid: cbdff3e37c153cc48b95d4374a38eed9, type: 3} + propertyPath: m_LocalPosition.y + value: 6.584535 + objectReference: {fileID: 0} + - target: {fileID: 7101811468694509626, guid: cbdff3e37c153cc48b95d4374a38eed9, type: 3} + propertyPath: m_LocalPosition.z + value: -3.0471425 + objectReference: {fileID: 0} + - target: {fileID: 7101811468694509626, guid: cbdff3e37c153cc48b95d4374a38eed9, type: 3} + propertyPath: m_LocalRotation.w + value: -0.70710707 + objectReference: {fileID: 0} + - target: {fileID: 7101811468694509626, guid: cbdff3e37c153cc48b95d4374a38eed9, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7101811468694509626, guid: cbdff3e37c153cc48b95d4374a38eed9, type: 3} + propertyPath: m_LocalRotation.y + value: -0.70710653 + objectReference: {fileID: 0} + - target: {fileID: 7101811468694509626, guid: cbdff3e37c153cc48b95d4374a38eed9, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7101811468694509626, guid: cbdff3e37c153cc48b95d4374a38eed9, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7101811468694509626, guid: cbdff3e37c153cc48b95d4374a38eed9, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -270 + objectReference: {fileID: 0} + - target: {fileID: 7101811468694509626, guid: cbdff3e37c153cc48b95d4374a38eed9, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7621607121521771136, guid: cbdff3e37c153cc48b95d4374a38eed9, type: 3} + propertyPath: m_Name + value: keyboard (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cbdff3e37c153cc48b95d4374a38eed9, type: 3} +--- !u!4 &497015422 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7101811468694509626, guid: cbdff3e37c153cc48b95d4374a38eed9, type: 3} + m_PrefabInstance: {fileID: 497015421} + m_PrefabAsset: {fileID: 0} --- !u!1001 &509503552 PrefabInstance: m_ObjectHideFlags: 0 @@ -16218,6 +16294,88 @@ Transform: m_Father: {fileID: 45957245} m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &899232841 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 146814758} + m_Modifications: + - target: {fileID: -4025371315460726001, guid: fde4367ea6917fe43b9f69a154c145c1, type: 3} + propertyPath: showLeftPreview + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4025371315460726001, guid: fde4367ea6917fe43b9f69a154c145c1, type: 3} + propertyPath: previewLeftInstance + value: + objectReference: {fileID: 0} + - target: {fileID: 6291597597410968062, guid: fde4367ea6917fe43b9f69a154c145c1, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6291597597410968062, guid: fde4367ea6917fe43b9f69a154c145c1, type: 3} + propertyPath: m_LocalScale.x + value: 1.7853693 + objectReference: {fileID: 0} + - target: {fileID: 6291597597410968062, guid: fde4367ea6917fe43b9f69a154c145c1, type: 3} + propertyPath: m_LocalScale.y + value: 1.7853729 + objectReference: {fileID: 0} + - target: {fileID: 6291597597410968062, guid: fde4367ea6917fe43b9f69a154c145c1, type: 3} + propertyPath: m_LocalScale.z + value: 1.7853729 + objectReference: {fileID: 0} + - target: {fileID: 6291597597410968062, guid: fde4367ea6917fe43b9f69a154c145c1, type: 3} + propertyPath: m_LocalPosition.x + value: 0.2522508 + objectReference: {fileID: 0} + - target: {fileID: 6291597597410968062, guid: fde4367ea6917fe43b9f69a154c145c1, type: 3} + propertyPath: m_LocalPosition.y + value: 6.2540994 + objectReference: {fileID: 0} + - target: {fileID: 6291597597410968062, guid: fde4367ea6917fe43b9f69a154c145c1, type: 3} + propertyPath: m_LocalPosition.z + value: 3.0602453 + objectReference: {fileID: 0} + - target: {fileID: 6291597597410968062, guid: fde4367ea6917fe43b9f69a154c145c1, type: 3} + propertyPath: m_LocalRotation.w + value: 0.50000113 + objectReference: {fileID: 0} + - target: {fileID: 6291597597410968062, guid: fde4367ea6917fe43b9f69a154c145c1, type: 3} + propertyPath: m_LocalRotation.x + value: 0.500001 + objectReference: {fileID: 0} + - target: {fileID: 6291597597410968062, guid: fde4367ea6917fe43b9f69a154c145c1, type: 3} + propertyPath: m_LocalRotation.y + value: 0.49999896 + objectReference: {fileID: 0} + - target: {fileID: 6291597597410968062, guid: fde4367ea6917fe43b9f69a154c145c1, type: 3} + propertyPath: m_LocalRotation.z + value: -0.499999 + objectReference: {fileID: 0} + - target: {fileID: 6291597597410968062, guid: fde4367ea6917fe43b9f69a154c145c1, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 6291597597410968062, guid: fde4367ea6917fe43b9f69a154c145c1, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -180 + objectReference: {fileID: 0} + - target: {fileID: 6291597597410968062, guid: fde4367ea6917fe43b9f69a154c145c1, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -270 + objectReference: {fileID: 0} + - target: {fileID: 6637160171134098244, guid: fde4367ea6917fe43b9f69a154c145c1, type: 3} + propertyPath: m_Name + value: Mouse (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: fde4367ea6917fe43b9f69a154c145c1, type: 3} +--- !u!4 &899232842 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6291597597410968062, guid: fde4367ea6917fe43b9f69a154c145c1, type: 3} + m_PrefabInstance: {fileID: 899232841} + m_PrefabAsset: {fileID: 0} --- !u!1 &915677069 GameObject: m_ObjectHideFlags: 0 @@ -20144,7 +20302,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh38800 + m_Name: pb_Mesh24450 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2