diff --git a/Assets/Models/Blender/Indoor_plant_02.blend b/Assets/Models/Blender/Indoor_plant_02.blend new file mode 100644 index 0000000..4cb3eca --- /dev/null +++ b/Assets/Models/Blender/Indoor_plant_02.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:03722580d11f7a0d0d5157a14c040dfdbad05ed9c2ed70fb884d33db59d7ea89 +size 1110154 diff --git a/Assets/Models/Blender/Indoor_plant_02.blend.meta b/Assets/Models/Blender/Indoor_plant_02.blend.meta new file mode 100644 index 0000000..6d79260 --- /dev/null +++ b/Assets/Models/Blender/Indoor_plant_02.blend.meta @@ -0,0 +1,106 @@ +fileFormatVersion: 2 +guid: 07c2bf6650029364ba8ebffa8f8be4bc +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/Indoor_plant_02.blend1 b/Assets/Models/Blender/Indoor_plant_02.blend1 new file mode 100644 index 0000000..5dc62b5 Binary files /dev/null and b/Assets/Models/Blender/Indoor_plant_02.blend1 differ diff --git a/Assets/Models/Blender/Indoor_plant_02.blend1.meta b/Assets/Models/Blender/Indoor_plant_02.blend1.meta new file mode 100644 index 0000000..de39661 --- /dev/null +++ b/Assets/Models/Blender/Indoor_plant_02.blend1.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f4154d993193adf4184e2bd352c41503 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/FabLab/FabLab.unity b/Assets/Scenes/FabLab/FabLab.unity index fe5d17a..4a2c7dd 100644 --- a/Assets/Scenes/FabLab/FabLab.unity +++ b/Assets/Scenes/FabLab/FabLab.unity @@ -2847,7 +2847,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 146814757} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -5.414, y: 1.005, z: -0.61399984} + m_LocalPosition: {x: -5.414, y: 1.005, z: -1.659} m_LocalScale: {x: 0.115000114, y: 0.11500003, z: 0.115000166} m_ConstrainProportionsScale: 0 m_Children: @@ -3200,6 +3200,80 @@ Transform: m_Father: {fileID: 503451125} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &197140881 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 808552922} + m_Modifications: + - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} + propertyPath: m_LocalScale.x + value: 0.000940938 + objectReference: {fileID: 0} + - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} + propertyPath: m_LocalScale.y + value: 0.000940938 + objectReference: {fileID: 0} + - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} + propertyPath: m_LocalScale.z + value: 0.000940938 + objectReference: {fileID: 0} + - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} + propertyPath: m_LocalPosition.x + value: 1.7307487 + objectReference: {fileID: 0} + - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} + propertyPath: m_LocalPosition.y + value: -0.3028674 + objectReference: {fileID: 0} + - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} + propertyPath: m_LocalPosition.z + value: 0.705 + objectReference: {fileID: 0} + - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071079 + objectReference: {fileID: 0} + - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071057 + objectReference: {fileID: 0} + - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6042578527978222026, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} + propertyPath: m_Name + value: UM3_UM3_Ultimaker (2) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} +--- !u!4 &197140882 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} + m_PrefabInstance: {fileID: 197140881} + m_PrefabAsset: {fileID: 0} --- !u!1001 &197592931 PrefabInstance: m_ObjectHideFlags: 0 @@ -9719,6 +9793,41 @@ Transform: m_CorrespondingSourceObject: {fileID: 905368309636460435, guid: 6e95f7c4a8765e544ab90d851dac3bdd, type: 3} m_PrefabInstance: {fileID: 807178094} m_PrefabAsset: {fileID: 0} +--- !u!1 &808552921 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 808552922} + m_Layer: 0 + m_Name: Imprimantes 3D + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &808552922 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 808552921} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -6.9382486, y: 2.1613674, z: 0.33254308} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1317084064} + - {fileID: 891532972} + - {fileID: 2128333932} + - {fileID: 197140882} + m_Father: {fileID: 0} + m_RootOrder: 10 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &817029044 stripped Transform: m_CorrespondingSourceObject: {fileID: 3674349604157782260, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} @@ -10664,6 +10773,80 @@ Transform: m_CorrespondingSourceObject: {fileID: 905368309636460435, guid: 6e95f7c4a8765e544ab90d851dac3bdd, type: 3} m_PrefabInstance: {fileID: 864801338} m_PrefabAsset: {fileID: 0} +--- !u!1001 &891532971 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 808552922} + m_Modifications: + - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} + propertyPath: m_LocalScale.x + value: 0.000940938 + objectReference: {fileID: 0} + - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} + propertyPath: m_LocalScale.y + value: 0.000940938 + objectReference: {fileID: 0} + - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} + propertyPath: m_LocalScale.z + value: 0.000940938 + objectReference: {fileID: 0} + - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} + propertyPath: m_LocalPosition.x + value: 1.7307487 + objectReference: {fileID: 0} + - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} + propertyPath: m_LocalPosition.y + value: -0.3028674 + objectReference: {fileID: 0} + - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} + propertyPath: m_LocalPosition.z + value: -0.304 + objectReference: {fileID: 0} + - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071079 + objectReference: {fileID: 0} + - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071057 + objectReference: {fileID: 0} + - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6042578527978222026, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} + propertyPath: m_Name + value: UM3_UM3_Ultimaker + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} +--- !u!4 &891532972 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} + m_PrefabInstance: {fileID: 891532971} + m_PrefabAsset: {fileID: 0} --- !u!1 &894468839 GameObject: m_ObjectHideFlags: 0 @@ -12488,6 +12671,76 @@ Mesh: offset: 0 size: 0 path: +--- !u!1001 &1317084063 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 808552922} + m_Modifications: + - target: {fileID: 3674349604157782260, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3674349604157782260, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} + propertyPath: m_LocalScale.x + value: 0.15144 + objectReference: {fileID: 0} + - target: {fileID: 3674349604157782260, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} + propertyPath: m_LocalScale.z + value: 0.0737964 + objectReference: {fileID: 0} + - target: {fileID: 3674349604157782260, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} + propertyPath: m_LocalPosition.x + value: 1.3312488 + objectReference: {fileID: 0} + - target: {fileID: 3674349604157782260, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} + propertyPath: m_LocalPosition.y + value: -1.149927 + objectReference: {fileID: 0} + - target: {fileID: 3674349604157782260, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} + propertyPath: m_LocalPosition.z + value: 0.3568 + objectReference: {fileID: 0} + - target: {fileID: 3674349604157782260, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071079 + objectReference: {fileID: 0} + - target: {fileID: 3674349604157782260, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3674349604157782260, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} + propertyPath: m_LocalRotation.y + value: -0.70710576 + objectReference: {fileID: 0} + - target: {fileID: 3674349604157782260, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3674349604157782260, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3674349604157782260, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 3674349604157782260, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4158574887593288270, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} + propertyPath: m_Name + value: Simple table + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} +--- !u!4 &1317084064 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3674349604157782260, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3} + m_PrefabInstance: {fileID: 1317084063} + m_PrefabAsset: {fileID: 0} --- !u!43 &1351932012 Mesh: m_ObjectHideFlags: 0 @@ -13430,7 +13683,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1672585691} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -3.757, y: 1.5, z: -3.146} + m_LocalPosition: {x: -2.204, y: 1.5, z: -3.146} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -17593,6 +17846,80 @@ Transform: m_CorrespondingSourceObject: {fileID: 6291597597410968062, guid: fde4367ea6917fe43b9f69a154c145c1, type: 3} m_PrefabInstance: {fileID: 2118229766} m_PrefabAsset: {fileID: 0} +--- !u!1001 &2128333931 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 808552922} + m_Modifications: + - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} + propertyPath: m_LocalScale.x + value: 0.000940938 + objectReference: {fileID: 0} + - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} + propertyPath: m_LocalScale.y + value: 0.000940938 + objectReference: {fileID: 0} + - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} + propertyPath: m_LocalScale.z + value: 0.000940938 + objectReference: {fileID: 0} + - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} + propertyPath: m_LocalPosition.x + value: 1.7307487 + objectReference: {fileID: 0} + - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} + propertyPath: m_LocalPosition.y + value: -0.3028674 + objectReference: {fileID: 0} + - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} + propertyPath: m_LocalPosition.z + value: 0.211 + objectReference: {fileID: 0} + - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071079 + objectReference: {fileID: 0} + - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071057 + objectReference: {fileID: 0} + - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6042578527978222026, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} + propertyPath: m_Name + value: UM3_UM3_Ultimaker (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} +--- !u!4 &2128333932 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5569992116628908473, guid: 3605d36a94a83634f940f71fad7f3930, type: 3} + m_PrefabInstance: {fileID: 2128333931} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2128389093 PrefabInstance: m_ObjectHideFlags: 0