VR-Sexe/Phillipes_Fablab
5
0
Fork 0
generated from VR-Sexe/Unity3DTemplate
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'Scripting' of https://git.k0rb4k.net/VR-Sexe/Phillipes_Fablab into Scripting

Browse Source
This commit is contained in:
Axel Galand 2023-01-19 10:39:31 +01:00
commit fc322562f1
48 changed files with 1486 additions and 696 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
Assets/Materials/Blatt.mat Normal file
View File

@ -0,0 +1,81 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Blatt
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ValidKeywords:
- _NORMALMAP
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 2800000, guid: 7f8a6c32d566d437a92532f2486d3a9a, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: abfcca803c90598f6a833f5cdff697d4, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 2800000, guid: bac0648176894df43ad96f883ef0a7dc, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []

6
Assets/Oculus/SampleFramework/Usage.meta → Assets/Materials/Blatt.mat.meta
View File

@ -1,8 +1,8 @@
fileFormatVersion: 2
guid: 8b578b5744fda3641a8d996a918ec63a
folderAsset: yes
DefaultImporter:
guid: 6fe8f072456f4ed47938896ac738c61c
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

6
Assets/Materials/Environment/Prises.mat
View File

@ -42,15 +42,15 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: 42be5b382f1f98b42b3c72b4424293c9, type: 3}
m_Texture: {fileID: 2800000, guid: 482b1529430b52d4a91b24ff348443ed, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 2800000, guid: aa303ab914cfce7498ac26155eae9c90, type: 3}
m_Texture: {fileID: 2800000, guid: f512a1bb22797484881cfda83c6c5439, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 2800000, guid: e1bd55c2f6156464496e0cdacc1f6f7f, type: 3}
m_Texture: {fileID: 2800000, guid: 629deea292961e64fac069fd693ca000, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:

2
Assets/Materials/Material 1.mat
View File

@ -50,7 +50,7 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Texture: {fileID: 2800000, guid: ef9c5573265abac4fbe691e4c7daea7f, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:

81
Assets/Materials/Material 2.mat Normal file
View File

@ -0,0 +1,81 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Material 2
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ValidKeywords:
- _NORMALMAP
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 2800000, guid: baf0b5bfde201bad39e4e7fd3319b820, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: b2a2ec834f9740205b5376c33a4fd82b, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 2800000, guid: 90a94831c54b1d94c809633460b7cd23, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []

6
Assets/Oculus.meta → Assets/Materials/Material 2.mat.meta
View File

@ -1,8 +1,8 @@
fileFormatVersion: 2
guid: df0dcc103894a574aac94418bb40e025
folderAsset: yes
DefaultImporter:
guid: 611458fe3dc6d76488ae4a08c7fe2168
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

9
Assets/Materials/Ultimaker.mat
View File

@ -2,14 +2,15 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Ultimaker
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
@ -48,13 +49,14 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Texture: {fileID: 2800000, guid: 3f329616a16a9b54bb92813ac2048319, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
@ -75,3 +77,4 @@ Material:
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []

14
Assets/Models/Blender/Indoor_plant.blend.meta
View File

@ -3,7 +3,17 @@ guid: d8a039318f27391cdb025c7bd542c092
ModelImporter:
serializedVersion: 21300
internalIDToNameTable: []
externalObjects: {}
externalObjects:
- first:
type: UnityEngine:Material
assembly: UnityEngine.CoreModule
name: Blatt
second: {fileID: 2100000, guid: 6fe8f072456f4ed47938896ac738c61c, type: 2}
- first:
type: UnityEngine:Material
assembly: UnityEngine.CoreModule
name: Material
second: {fileID: 2100000, guid: 611458fe3dc6d76488ae4a08c7fe2168, type: 2}
materials:
materialImportMode: 2
materialName: 0
@ -69,7 +79,7 @@ ModelImporter:
useFileScale: 1
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
normalImportMode: 1
tangentImportMode: 3
normalCalculationMode: 4
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0

4
Assets/Models/Blender/Logitech_G603_Turbosquid.blend.meta
View File

@ -32,7 +32,7 @@ ModelImporter:
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
isReadable: 0
isReadable: 1
meshes:
lODScreenPercentages: []
globalScale: 1
@ -69,7 +69,7 @@ ModelImporter:
useFileScale: 1
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
normalImportMode: 1
tangentImportMode: 3
normalCalculationMode: 4
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0

2
Assets/Models/Blender/circuitboard.blend.meta
View File

@ -37,7 +37,7 @@ ModelImporter:
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
isReadable: 0
isReadable: 1
meshes:
lODScreenPercentages: []
globalScale: 1

2
Assets/Models/Blender/hammer.blend.meta
View File

@ -32,7 +32,7 @@ ModelImporter:
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
isReadable: 0
isReadable: 1
meshes:
lODScreenPercentages: []
globalScale: 1

2
Assets/Models/Blender/keyboard.blend.meta
View File

@ -32,7 +32,7 @@ ModelImporter:
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
isReadable: 0
isReadable: 1
meshes:
lODScreenPercentages: []
globalScale: 1

4
Assets/Models/Blender/pliers.blend.meta
View File

@ -32,7 +32,7 @@ ModelImporter:
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
isReadable: 0
isReadable: 1
meshes:
lODScreenPercentages: []
globalScale: 1
@ -69,7 +69,7 @@ ModelImporter:
useFileScale: 1
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
normalImportMode: 1
tangentImportMode: 3
normalCalculationMode: 4
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0

2
Assets/Models/Blender/prises_12.blend.meta
View File

@ -69,7 +69,7 @@ ModelImporter:
useFileScale: 1
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
normalImportMode: 1
tangentImportMode: 3
normalCalculationMode: 4
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0

2
Assets/Models/Blender/screwdriver.blend.meta
View File

@ -84,7 +84,7 @@ ModelImporter:
useFileScale: 1
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
normalImportMode: 1
tangentImportMode: 3
normalCalculationMode: 4
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0

12
Assets/Models/IndoorPlant01.prefab
View File

@ -26,14 +26,14 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 999207089627997314}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0, z: -0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 5690670490328783864}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
--- !u!33 &2991921771696845434
MeshFilter:
m_ObjectHideFlags: 0
@ -121,7 +121,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5022219494863929666}
m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 4.2239313, y: 1.046101, z: -0.024066806}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@ -130,7 +130,7 @@ Transform:
- {fileID: 1171425573176347497}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &5727137902744118718
MonoBehaviour:
m_ObjectHideFlags: 0
@ -172,14 +172,14 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8294151951189356629}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0, z: -0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 5690670490328783864}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
--- !u!33 &13326192116113386
MeshFilter:
m_ObjectHideFlags: 0

176
Assets/Models/IndoorPlant02.prefab
View File

@ -9,9 +9,6 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 5869846997090749818}
- component: {fileID: 7411298994668946143}
- component: {fileID: 4701421984937096725}
- component: {fileID: 8484002625320914911}
- component: {fileID: 3699449891368907159}
m_Layer: 0
m_Name: IndoorPlant02
@ -27,80 +24,15 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6502689968648656832}
m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 3.9697971, y: 1.0193512, z: -1.9544978}
m_LocalScale: {x: 0.2, y: 0.2, z: 0.2}
m_ConstrainProportionsScale: 1
m_Children: []
m_Children:
- {fileID: 998248800948701156}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
--- !u!33 &7411298994668946143
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6502689968648656832}
m_Mesh: {fileID: -8191014951145575825, guid: b576e8f0e161724c1af4d977abf9031c, type: 3}
--- !u!23 &4701421984937096725
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6502689968648656832}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 8068d11ef6a02a112a682047db9a8f5c, type: 2}
- {fileID: 2100000, guid: 8068d11ef6a02a112a682047db9a8f5c, type: 2}
- {fileID: 2100000, guid: 8068d11ef6a02a112a682047db9a8f5c, type: 2}
- {fileID: 2100000, guid: 8068d11ef6a02a112a682047db9a8f5c, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!65 &8484002625320914911
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6502689968648656832}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1.945082, y: 2.0702388, z: 6.223421}
m_Center: {x: -0.04922211, y: -0.01309447, z: 3.1023586}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &3699449891368907159
MonoBehaviour:
m_ObjectHideFlags: 0
@ -116,3 +48,103 @@ MonoBehaviour:
combinedBounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
--- !u!1001 &743310008199716879
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 5869846997090749818}
m_Modifications:
- target: {fileID: -8679921383154817045, guid: b576e8f0e161724c1af4d977abf9031c, type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: b576e8f0e161724c1af4d977abf9031c, type: 3}
propertyPath: m_LocalPosition.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: b576e8f0e161724c1af4d977abf9031c, type: 3}
propertyPath: m_LocalPosition.y
value: 0.16987896
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: b576e8f0e161724c1af4d977abf9031c, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: b576e8f0e161724c1af4d977abf9031c, type: 3}
propertyPath: m_LocalRotation.w
value: 0.2690923
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: b576e8f0e161724c1af4d977abf9031c, type: 3}
propertyPath: m_LocalRotation.x
value: -0.2690923
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: b576e8f0e161724c1af4d977abf9031c, type: 3}
propertyPath: m_LocalRotation.y
value: -0.6539032
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: b576e8f0e161724c1af4d977abf9031c, type: 3}
propertyPath: m_LocalRotation.z
value: -0.6539032
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: b576e8f0e161724c1af4d977abf9031c, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: -90
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: b576e8f0e161724c1af4d977abf9031c, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: b576e8f0e161724c1af4d977abf9031c, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: -135.264
objectReference: {fileID: 0}
- target: {fileID: -7511558181221131132, guid: b576e8f0e161724c1af4d977abf9031c, type: 3}
propertyPath: m_Materials.Array.size
value: 4
objectReference: {fileID: 0}
- target: {fileID: -7511558181221131132, guid: b576e8f0e161724c1af4d977abf9031c, type: 3}
propertyPath: m_Materials.Array.data[1]
value:
objectReference: {fileID: 6141528588927383208, guid: b576e8f0e161724c1af4d977abf9031c, type: 3}
- target: {fileID: -7511558181221131132, guid: b576e8f0e161724c1af4d977abf9031c, type: 3}
propertyPath: m_Materials.Array.data[2]
value:
objectReference: {fileID: 6141528588927383208, guid: b576e8f0e161724c1af4d977abf9031c, type: 3}
- target: {fileID: -7511558181221131132, guid: b576e8f0e161724c1af4d977abf9031c, type: 3}
propertyPath: m_Materials.Array.data[3]
value:
objectReference: {fileID: 6141528588927383208, guid: b576e8f0e161724c1af4d977abf9031c, type: 3}
- target: {fileID: -7511558181221131132, guid: b576e8f0e161724c1af4d977abf9031c, type: 3}
propertyPath: m_Materials.Array.data[4]
value:
objectReference: {fileID: 184314014045862100, guid: b576e8f0e161724c1af4d977abf9031c, type: 3}
- target: {fileID: 919132149155446097, guid: b576e8f0e161724c1af4d977abf9031c, type: 3}
propertyPath: m_Name
value: Indoor_plant_02
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: b576e8f0e161724c1af4d977abf9031c, type: 3}
--- !u!1 &473350004634918238 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: b576e8f0e161724c1af4d977abf9031c, type: 3}
m_PrefabInstance: {fileID: 743310008199716879}
m_PrefabAsset: {fileID: 0}
--- !u!65 &2863737753762090861
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 473350004634918238}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1.945082, y: 2.0702388, z: 6.223421}
m_Center: {x: -0.04922211, y: -0.01309447, z: 3.1023586}
--- !u!4 &998248800948701156 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: b576e8f0e161724c1af4d977abf9031c, type: 3}
m_PrefabInstance: {fileID: 743310008199716879}
m_PrefabAsset: {fileID: 0}

257
Assets/Models/circuitboard.prefab
View File

@ -1,147 +1,42 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &5376596017825718853
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: -8679921383154817045, guid: 49362df3fa9630d41bbc0bd46629331f, type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 49362df3fa9630d41bbc0bd46629331f, type: 3}
propertyPath: m_LocalScale.x
value: 0.018889
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 49362df3fa9630d41bbc0bd46629331f, type: 3}
propertyPath: m_LocalScale.y
value: 0.018889
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 49362df3fa9630d41bbc0bd46629331f, type: 3}
propertyPath: m_LocalScale.z
value: 0.018889
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 49362df3fa9630d41bbc0bd46629331f, type: 3}
propertyPath: m_LocalPosition.x
value: -3.2457
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 49362df3fa9630d41bbc0bd46629331f, type: 3}
propertyPath: m_LocalPosition.y
value: 1.712
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 49362df3fa9630d41bbc0bd46629331f, type: 3}
propertyPath: m_LocalPosition.z
value: -1.19
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 49362df3fa9630d41bbc0bd46629331f, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 49362df3fa9630d41bbc0bd46629331f, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 49362df3fa9630d41bbc0bd46629331f, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 49362df3fa9630d41bbc0bd46629331f, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 49362df3fa9630d41bbc0bd46629331f, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 49362df3fa9630d41bbc0bd46629331f, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 49362df3fa9630d41bbc0bd46629331f, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -6767529993520989264, guid: 49362df3fa9630d41bbc0bd46629331f, type: 3}
propertyPath: m_LocalPosition.y
value: 0.68
objectReference: {fileID: 0}
- target: {fileID: -5477749408508380018, guid: 49362df3fa9630d41bbc0bd46629331f, type: 3}
propertyPath: m_LocalPosition.y
value: 0.191
objectReference: {fileID: 0}
- target: {fileID: -3249217615815079162, guid: 49362df3fa9630d41bbc0bd46629331f, type: 3}
propertyPath: m_LocalScale.y
value: 0.39958176
objectReference: {fileID: 0}
- target: {fileID: -3249217615815079162, guid: 49362df3fa9630d41bbc0bd46629331f, type: 3}
propertyPath: m_LocalPosition.y
value: 0.424
objectReference: {fileID: 0}
- target: {fileID: -380270054046959717, guid: 49362df3fa9630d41bbc0bd46629331f, type: 3}
propertyPath: m_LocalScale.y
value: 0.5361409
objectReference: {fileID: 0}
- target: {fileID: -380270054046959717, guid: 49362df3fa9630d41bbc0bd46629331f, type: 3}
propertyPath: m_LocalPosition.y
value: 0.52
objectReference: {fileID: 0}
- target: {fileID: 426146486632879946, guid: 49362df3fa9630d41bbc0bd46629331f, type: 3}
propertyPath: m_LocalScale.z
value: 0.53232
objectReference: {fileID: 0}
- target: {fileID: 426146486632879946, guid: 49362df3fa9630d41bbc0bd46629331f, type: 3}
propertyPath: m_LocalPosition.y
value: 0.48
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 49362df3fa9630d41bbc0bd46629331f, type: 3}
propertyPath: m_Name
value: circuitboard
objectReference: {fileID: 0}
- target: {fileID: 2705875545084736805, guid: 49362df3fa9630d41bbc0bd46629331f, type: 3}
propertyPath: m_LocalScale.z
value: 0.45455
objectReference: {fileID: 0}
- target: {fileID: 2705875545084736805, guid: 49362df3fa9630d41bbc0bd46629331f, type: 3}
propertyPath: m_LocalPosition.y
value: 0.397
objectReference: {fileID: 0}
- target: {fileID: 4306643203051859313, guid: 49362df3fa9630d41bbc0bd46629331f, type: 3}
propertyPath: m_LocalPosition.y
value: 0.2
objectReference: {fileID: 0}
- target: {fileID: 4961036603283160211, guid: 49362df3fa9630d41bbc0bd46629331f, type: 3}
propertyPath: m_LocalScale.y
value: 0.37511382
objectReference: {fileID: 0}
- target: {fileID: 4961036603283160211, guid: 49362df3fa9630d41bbc0bd46629331f, type: 3}
propertyPath: m_LocalPosition.y
value: 0.365
objectReference: {fileID: 0}
- target: {fileID: 8779521643239218905, guid: 49362df3fa9630d41bbc0bd46629331f, type: 3}
propertyPath: m_LocalScale.y
value: 0.46703628
objectReference: {fileID: 0}
- target: {fileID: 8779521643239218905, guid: 49362df3fa9630d41bbc0bd46629331f, type: 3}
propertyPath: m_LocalPosition.y
value: 0.467
objectReference: {fileID: 0}
- target: {fileID: 8972230635431651539, guid: 49362df3fa9630d41bbc0bd46629331f, type: 3}
propertyPath: m_LocalScale.y
value: 0.37382415
objectReference: {fileID: 0}
- target: {fileID: 8972230635431651539, guid: 49362df3fa9630d41bbc0bd46629331f, type: 3}
propertyPath: m_LocalPosition.y
value: 0.38
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 49362df3fa9630d41bbc0bd46629331f, type: 3}
--- !u!1 &5070182670462689044 stripped
--- !u!1 &5070182670462689044
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 49362df3fa9630d41bbc0bd46629331f, type: 3}
m_PrefabInstance: {fileID: 5376596017825718853}
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5554971243091150254}
- component: {fileID: 2701333433414217505}
- component: {fileID: -4431022277672732694}
- component: {fileID: 4197128717957136542}
- component: {fileID: 5146560493390744643}
- component: {fileID: 7891181180270717245}
m_Layer: 0
m_Name: circuitboard
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &5554971243091150254
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5070182670462689044}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.018889, y: 0.018889, z: 0.018889}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 7245493987618605638}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &2701333433414217505
BoxCollider:
m_ObjectHideFlags: 0
@ -153,8 +48,8 @@ BoxCollider:
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 10.236521, y: 0.1180733, z: 10.341999}
m_Center: {x: -0.08280562, y: 0.026818777, z: 0.02435037}
m_Size: {x: 10.014801, y: 0.1180733, z: 9.995088}
m_Center: {x: -1.519139, y: -0.49, z: 2.5865412}
--- !u!114 &-4431022277672732694
MonoBehaviour:
m_ObjectHideFlags: 0
@ -249,3 +144,81 @@ MonoBehaviour:
highlightOnHover: 1
hideHighlight: []
hoverPriority: 0
--- !u!54 &7891181180270717245
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5070182670462689044}
serializedVersion: 2
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0.05
m_UseGravity: 1
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!1001 &7135833873472105901
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 5554971243091150254}
m_Modifications:
- target: {fileID: -8679921383154817045, guid: 49362df3fa9630d41bbc0bd46629331f, type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 49362df3fa9630d41bbc0bd46629331f, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 49362df3fa9630d41bbc0bd46629331f, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 49362df3fa9630d41bbc0bd46629331f, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 49362df3fa9630d41bbc0bd46629331f, type: 3}
propertyPath: m_LocalRotation.w
value: -0.5
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 49362df3fa9630d41bbc0bd46629331f, type: 3}
propertyPath: m_LocalRotation.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 49362df3fa9630d41bbc0bd46629331f, type: 3}
propertyPath: m_LocalRotation.y
value: -0.49999997
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 49362df3fa9630d41bbc0bd46629331f, type: 3}
propertyPath: m_LocalRotation.z
value: -0.5
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 49362df3fa9630d41bbc0bd46629331f, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 49362df3fa9630d41bbc0bd46629331f, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 49362df3fa9630d41bbc0bd46629331f, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 49362df3fa9630d41bbc0bd46629331f, type: 3}
propertyPath: m_Name
value: circuitboard
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 49362df3fa9630d41bbc0bd46629331f, type: 3}
--- !u!4 &7245493987618605638 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 49362df3fa9630d41bbc0bd46629331f, type: 3}
m_PrefabInstance: {fileID: 7135833873472105901}
m_PrefabAsset: {fileID: 0}

63
Assets/Models/prises_12 Variant 1.prefab Normal file
View File

@ -0,0 +1,63 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &6587971456965902946
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: -8679921383154817045, guid: c4bc9709ddd4c084bb149cd4b8d93914, type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: c4bc9709ddd4c084bb149cd4b8d93914, type: 3}
propertyPath: m_LocalPosition.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: c4bc9709ddd4c084bb149cd4b8d93914, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: c4bc9709ddd4c084bb149cd4b8d93914, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: c4bc9709ddd4c084bb149cd4b8d93914, type: 3}
propertyPath: m_LocalRotation.w
value: 0.7071067
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: c4bc9709ddd4c084bb149cd4b8d93914, type: 3}
propertyPath: m_LocalRotation.x
value: -0.7071068
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: c4bc9709ddd4c084bb149cd4b8d93914, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: c4bc9709ddd4c084bb149cd4b8d93914, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: c4bc9709ddd4c084bb149cd4b8d93914, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: c4bc9709ddd4c084bb149cd4b8d93914, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: c4bc9709ddd4c084bb149cd4b8d93914, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -7511558181221131132, guid: c4bc9709ddd4c084bb149cd4b8d93914, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 6de1a72ff651b264ebb6757e18797524, type: 2}
- target: {fileID: 919132149155446097, guid: c4bc9709ddd4c084bb149cd4b8d93914, type: 3}
propertyPath: m_Name
value: prises_12 Variant 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c4bc9709ddd4c084bb149cd4b8d93914, type: 3}

2
Assets/Models/prises_12 Variant.prefab.meta → Assets/Models/prises_12 Variant 1.prefab.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: f494ea85b1685cb43b8956b1a1ccaaa2
guid: f4664e62a3f09ce4894b51aeb60470bd
PrefabImporter:
externalObjects: {}
userData:

97
Assets/Models/prises_12 Variant.prefab
View File

@ -1,97 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &8424642876386289158
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: -8679921383154817045, guid: 53cb2d1a2f0c7c0468ba87eba075cd9a, type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 53cb2d1a2f0c7c0468ba87eba075cd9a, type: 3}
propertyPath: m_LocalScale.x
value: 0.045406
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 53cb2d1a2f0c7c0468ba87eba075cd9a, type: 3}
propertyPath: m_LocalScale.y
value: 0.045406
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 53cb2d1a2f0c7c0468ba87eba075cd9a, type: 3}
propertyPath: m_LocalScale.z
value: 0.045406
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 53cb2d1a2f0c7c0468ba87eba075cd9a, type: 3}
propertyPath: m_LocalPosition.x
value: 4.3833137
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 53cb2d1a2f0c7c0468ba87eba075cd9a, type: 3}
propertyPath: m_LocalPosition.y
value: 1.01
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 53cb2d1a2f0c7c0468ba87eba075cd9a, type: 3}
propertyPath: m_LocalPosition.z
value: 2.523235
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 53cb2d1a2f0c7c0468ba87eba075cd9a, type: 3}
propertyPath: m_LocalRotation.w
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 53cb2d1a2f0c7c0468ba87eba075cd9a, type: 3}
propertyPath: m_LocalRotation.x
value: -0.7071068
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 53cb2d1a2f0c7c0468ba87eba075cd9a, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 53cb2d1a2f0c7c0468ba87eba075cd9a, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 53cb2d1a2f0c7c0468ba87eba075cd9a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: -90
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 53cb2d1a2f0c7c0468ba87eba075cd9a, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 53cb2d1a2f0c7c0468ba87eba075cd9a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -7511558181221131132, guid: 53cb2d1a2f0c7c0468ba87eba075cd9a, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 6de1a72ff651b264ebb6757e18797524, type: 2}
- target: {fileID: 919132149155446097, guid: 53cb2d1a2f0c7c0468ba87eba075cd9a, type: 3}
propertyPath: m_Name
value: prises_12 Variant
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 53cb2d1a2f0c7c0468ba87eba075cd9a, type: 3}
propertyPath: m_StaticEditorFlags
value: 2147483647
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 53cb2d1a2f0c7c0468ba87eba075cd9a, type: 3}
--- !u!1 &8659069540560968535 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 53cb2d1a2f0c7c0468ba87eba075cd9a, type: 3}
m_PrefabInstance: {fileID: 8424642876386289158}
m_PrefabAsset: {fileID: 0}
--- !u!65 &5569419538991485710
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8659069540560968535}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 240, y: 2.1047657, z: 4.0000005}
m_Center: {x: -110, y: 0.052382655, z: 0}

18
Assets/Models/smarttv.prefab
View File

@ -24,7 +24,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2835658414891243653}
m_LocalRotation: {x: -0.7193398, y: 0, z: 0, w: 0.69465846}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.06708567, y: 0.06708567, z: 0.06708567}
m_ConstrainProportionsScale: 0
@ -32,7 +32,7 @@ Transform:
- {fileID: 6063464173187445548}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: -92, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &6811449984730649892
MonoBehaviour:
m_ObjectHideFlags: 0
@ -90,31 +90,31 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4313268324301600403, guid: 5035aafbde1dd40458b242f88962c3d3, type: 3}
propertyPath: m_LocalRotation.w
value: -0.0000015507267
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4313268324301600403, guid: 5035aafbde1dd40458b242f88962c3d3, type: 3}
propertyPath: m_LocalRotation.x
value: -0.0000016830891
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4313268324301600403, guid: 5035aafbde1dd40458b242f88962c3d3, type: 3}
propertyPath: m_LocalRotation.y
value: -0.72537434
value: -0.99965733
objectReference: {fileID: 0}
- target: {fileID: 4313268324301600403, guid: 5035aafbde1dd40458b242f88962c3d3, type: 3}
propertyPath: m_LocalRotation.z
value: -0.6883546
value: 0.026176924
objectReference: {fileID: 0}
- target: {fileID: 4313268324301600403, guid: 5035aafbde1dd40458b242f88962c3d3, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: -93
value: -183
objectReference: {fileID: 0}
- target: {fileID: 4313268324301600403, guid: 5035aafbde1dd40458b242f88962c3d3, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: -0.005
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4313268324301600403, guid: 5035aafbde1dd40458b242f88962c3d3, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: -179.995
value: -180
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 7452765709190415340, guid: 5035aafbde1dd40458b242f88962c3d3, type: 3}

8
Assets/Oculus/SampleFramework.meta
View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 33447c8a863894d4bbf1cef27bfebf3b
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
Assets/Oculus/Spatializer.meta
View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: fc4486eb4d7102241b096aaafc334547
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
Assets/Oculus/Spatializer/Plugins.meta
View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 98f8de3e06b691a4a81218b17f50425b
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
Assets/Oculus/Spatializer/Plugins/x86_64.meta
View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 5157f25f994439847b0d979faa555a6f
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Oculus/Spatializer/Plugins/x86_64/AudioPluginOculusSpatializer.dll (Stored with Git LFS)
View File

Binary file not shown.

52
Assets/Oculus/Spatializer/Plugins/x86_64/AudioPluginOculusSpatializer.dll.meta
View File

@ -1,52 +0,0 @@
fileFormatVersion: 2
guid: b04daa6d01896124887375a1bfa9b4bf
PluginImporter:
externalObjects: {}
serializedVersion: 2
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 1
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
- first:
Any:
second:
enabled: 1
settings: {}
- first:
Editor: Editor
second:
enabled: 0
settings:
CPU: x86_64
DefaultValueInitialized: true
- first:
Standalone: Linux64
second:
enabled: 1
settings:
CPU: x86_64
- first:
Standalone: OSXUniversal
second:
enabled: 1
settings:
CPU: x86_64
- first:
Standalone: Win
second:
enabled: 0
settings:
CPU: None
- first:
Standalone: Win64
second:
enabled: 1
settings:
CPU: x86_64
userData:
assetBundleName:
assetBundleVariant:

8
Assets/Oculus/VR.meta
View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: c30f884b9f976b846a902f421e77c369
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
Assets/Oculus/VR/Plugins.meta
View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: e1f06b56b3e7614419c5db24e2262938
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
Assets/Oculus/VR/Plugins/1.79.0.meta
View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 06e3f397f334afc4c9e9147486c1394c
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
Assets/Oculus/VR/Plugins/1.79.0/Win64OpenXR.meta
View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 60733b08805636e408e2d2c443f1d7f0
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Oculus/VR/Plugins/1.79.0/Win64OpenXR/OVRPlugin.dll (Stored with Git LFS)
View File

Binary file not shown.

27
Assets/Oculus/VR/Plugins/1.79.0/Win64OpenXR/OVRPlugin.dll.meta
View File

@ -1,27 +0,0 @@
fileFormatVersion: 2
guid: bfdf91cb91d3f2045bd3714bcd05fd7c
PluginImporter:
externalObjects: {}
serializedVersion: 2
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
- first:
Any:
second:
enabled: 1
settings: {}
- first:
Editor: Editor
second:
enabled: 0
settings:
DefaultValueInitialized: true
userData:
assetBundleName:
assetBundleVariant:

481
Assets/Scenes/FabLab/FabLab.unity
View File

@ -2289,6 +2289,79 @@ BoxCollider:
serializedVersion: 2
m_Size: {x: 1.0000042, y: 13.999998, z: 9}
m_Center: {x: 0.49999774, y: 6.0007696, z: -3.5}
--- !u!1001 &60326085
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 6317500189218225971, guid: f4664e62a3f09ce4894b51aeb60470bd, type: 3}
propertyPath: m_Name
value: prises_12 Variant 1
objectReference: {fileID: 0}
- target: {fileID: 6317500189218225971, guid: f4664e62a3f09ce4894b51aeb60470bd, type: 3}
propertyPath: m_StaticEditorFlags
value: 2147483647
objectReference: {fileID: 0}
- target: {fileID: 6694482510281237897, guid: f4664e62a3f09ce4894b51aeb60470bd, type: 3}
propertyPath: m_RootOrder
value: 18
objectReference: {fileID: 0}
- target: {fileID: 6694482510281237897, guid: f4664e62a3f09ce4894b51aeb60470bd, type: 3}
propertyPath: m_LocalScale.x
value: 0.045406
objectReference: {fileID: 0}
- target: {fileID: 6694482510281237897, guid: f4664e62a3f09ce4894b51aeb60470bd, type: 3}
propertyPath: m_LocalScale.y
value: 0.045406
objectReference: {fileID: 0}
- target: {fileID: 6694482510281237897, guid: f4664e62a3f09ce4894b51aeb60470bd, type: 3}
propertyPath: m_LocalScale.z
value: 0.045406
objectReference: {fileID: 0}
- target: {fileID: 6694482510281237897, guid: f4664e62a3f09ce4894b51aeb60470bd, type: 3}
propertyPath: m_LocalPosition.x
value: 5.178
objectReference: {fileID: 0}
- target: {fileID: 6694482510281237897, guid: f4664e62a3f09ce4894b51aeb60470bd, type: 3}
propertyPath: m_LocalPosition.y
value: 1.087
objectReference: {fileID: 0}
- target: {fileID: 6694482510281237897, guid: f4664e62a3f09ce4894b51aeb60470bd, type: 3}
propertyPath: m_LocalPosition.z
value: 3.454
objectReference: {fileID: 0}
- target: {fileID: 6694482510281237897, guid: f4664e62a3f09ce4894b51aeb60470bd, type: 3}
propertyPath: m_LocalRotation.w
value: 0.7071067
objectReference: {fileID: 0}
- target: {fileID: 6694482510281237897, guid: f4664e62a3f09ce4894b51aeb60470bd, type: 3}
propertyPath: m_LocalRotation.x
value: -0.7071068
objectReference: {fileID: 0}
- target: {fileID: 6694482510281237897, guid: f4664e62a3f09ce4894b51aeb60470bd, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6694482510281237897, guid: f4664e62a3f09ce4894b51aeb60470bd, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 6694482510281237897, guid: f4664e62a3f09ce4894b51aeb60470bd, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6694482510281237897, guid: f4664e62a3f09ce4894b51aeb60470bd, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6694482510281237897, guid: f4664e62a3f09ce4894b51aeb60470bd, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: f4664e62a3f09ce4894b51aeb60470bd, type: 3}
--- !u!1001 &106737815
PrefabInstance:
m_ObjectHideFlags: 0
@ -2515,7 +2588,7 @@ Transform:
- {fileID: 1378541949}
- {fileID: 363747407}
m_Father: {fileID: 0}
m_RootOrder: 13
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &193352389
PrefabInstance:
@ -2732,19 +2805,19 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 8531222383232042004, guid: 0615df42b5cd5f1429cafa57731d1869, type: 3}
propertyPath: m_RootOrder
value: 2
value: 4
objectReference: {fileID: 0}
- target: {fileID: 8531222383232042004, guid: 0615df42b5cd5f1429cafa57731d1869, type: 3}
propertyPath: m_LocalPosition.x
value: 0.08329463
value: 0.0062946305
objectReference: {fileID: 0}
- target: {fileID: 8531222383232042004, guid: 0615df42b5cd5f1429cafa57731d1869, type: 3}
propertyPath: m_LocalPosition.y
value: -0.4288782
value: 0.3921218
objectReference: {fileID: 0}
- target: {fileID: 8531222383232042004, guid: 0615df42b5cd5f1429cafa57731d1869, type: 3}
propertyPath: m_LocalPosition.z
value: 1.8049283
value: 0.013928294
objectReference: {fileID: 0}
- target: {fileID: 8531222383232042004, guid: 0615df42b5cd5f1429cafa57731d1869, type: 3}
propertyPath: m_LocalRotation.w
@ -2806,7 +2879,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5554971243091150254, guid: 124ae331af1b2e845b7de5a2ccb168d4, type: 3}
propertyPath: m_LocalPosition.y
value: 0.444
value: 0.26
objectReference: {fileID: 0}
- target: {fileID: 5554971243091150254, guid: 124ae331af1b2e845b7de5a2ccb168d4, type: 3}
propertyPath: m_LocalPosition.z
@ -2941,7 +3014,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: -8679921383154817045, guid: d8a039318f27391cdb025c7bd542c092, type: 3}
propertyPath: m_RootOrder
value: 18
value: 17
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: d8a039318f27391cdb025c7bd542c092, type: 3}
propertyPath: m_LocalPosition.x
@ -3000,7 +3073,7 @@ Mesh:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: pb_Mesh23788
m_Name: pb_Mesh23780
serializedVersion: 10
m_SubMeshes:
- serializedVersion: 2
@ -3432,6 +3505,79 @@ Transform:
m_CorrespondingSourceObject: {fileID: 1608754001926958217, guid: 2b8a7c87024464d41b9b69bea53a767e, type: 3}
m_PrefabInstance: {fileID: 366020801}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &373875249
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 6317500189218225971, guid: f4664e62a3f09ce4894b51aeb60470bd, type: 3}
propertyPath: m_Name
value: prises_12 Variant 1 (1)
objectReference: {fileID: 0}
- target: {fileID: 6317500189218225971, guid: f4664e62a3f09ce4894b51aeb60470bd, type: 3}
propertyPath: m_StaticEditorFlags
value: 2147483647
objectReference: {fileID: 0}
- target: {fileID: 6694482510281237897, guid: f4664e62a3f09ce4894b51aeb60470bd, type: 3}
propertyPath: m_RootOrder
value: 19
objectReference: {fileID: 0}
- target: {fileID: 6694482510281237897, guid: f4664e62a3f09ce4894b51aeb60470bd, type: 3}
propertyPath: m_LocalScale.x
value: 0.045406
objectReference: {fileID: 0}
- target: {fileID: 6694482510281237897, guid: f4664e62a3f09ce4894b51aeb60470bd, type: 3}
propertyPath: m_LocalScale.y
value: 0.045406
objectReference: {fileID: 0}
- target: {fileID: 6694482510281237897, guid: f4664e62a3f09ce4894b51aeb60470bd, type: 3}
propertyPath: m_LocalScale.z
value: 0.045406
objectReference: {fileID: 0}
- target: {fileID: 6694482510281237897, guid: f4664e62a3f09ce4894b51aeb60470bd, type: 3}
propertyPath: m_LocalPosition.x
value: -4.81132
objectReference: {fileID: 0}
- target: {fileID: 6694482510281237897, guid: f4664e62a3f09ce4894b51aeb60470bd, type: 3}
propertyPath: m_LocalPosition.y
value: 1.09
objectReference: {fileID: 0}
- target: {fileID: 6694482510281237897, guid: f4664e62a3f09ce4894b51aeb60470bd, type: 3}
propertyPath: m_LocalPosition.z
value: -3.456
objectReference: {fileID: 0}
- target: {fileID: 6694482510281237897, guid: f4664e62a3f09ce4894b51aeb60470bd, type: 3}
propertyPath: m_LocalRotation.w
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6694482510281237897, guid: f4664e62a3f09ce4894b51aeb60470bd, type: 3}
propertyPath: m_LocalRotation.x
value: -0.000000015045531
objectReference: {fileID: 0}
- target: {fileID: 6694482510281237897, guid: f4664e62a3f09ce4894b51aeb60470bd, type: 3}
propertyPath: m_LocalRotation.y
value: 0.70710677
objectReference: {fileID: 0}
- target: {fileID: 6694482510281237897, guid: f4664e62a3f09ce4894b51aeb60470bd, type: 3}
propertyPath: m_LocalRotation.z
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 6694482510281237897, guid: f4664e62a3f09ce4894b51aeb60470bd, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: -90
objectReference: {fileID: 0}
- target: {fileID: 6694482510281237897, guid: f4664e62a3f09ce4894b51aeb60470bd, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6694482510281237897, guid: f4664e62a3f09ce4894b51aeb60470bd, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 180
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: f4664e62a3f09ce4894b51aeb60470bd, type: 3}
--- !u!1001 &374513604
PrefabInstance:
m_ObjectHideFlags: 0
@ -3568,6 +3714,170 @@ Transform:
m_CorrespondingSourceObject: {fileID: 5367457311287030540, guid: ab468a82ad445da4e9a084297505261f, type: 3}
m_PrefabInstance: {fileID: 391302636}
m_PrefabAsset: {fileID: 0}
--- !u!43 &393459863
Mesh:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: pb_Mesh23894
serializedVersion: 10
m_SubMeshes:
- serializedVersion: 2
firstByte: 0
indexCount: 12
topology: 0
baseVertex: 0
firstVertex: 0
vertexCount: 8
localAABB:
m_Center: {x: -7, y: 1.5, z: 0.5}
m_Extent: {x: 7, y: 2.5, z: 0.5}
m_Shapes:
vertices: []
shapes: []
channels: []
fullWeights: []
m_BindPose: []
m_BoneNameHashes:
m_RootBoneNameHash: 0
m_BonesAABB: []
m_VariableBoneCountWeights:
m_Data:
m_MeshCompression: 0
m_IsReadable: 1
m_KeepVertices: 1
m_KeepIndices: 1
m_IndexFormat: 0
m_IndexBuffer: 000001000200010003000200040005000600050007000600
m_VertexData:
serializedVersion: 3
m_VertexCount: 8
m_Channels:
- stream: 0
offset: 0
format: 0
dimension: 3
- stream: 0
offset: 12
format: 0
dimension: 3
- stream: 0
offset: 24
format: 0
dimension: 4
- stream: 0
offset: 0
format: 0
dimension: 0
- stream: 0
offset: 40
format: 0
dimension: 2
- stream: 0
offset: 48
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: 0
format: 0
dimension: 0
- 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: 0
format: 0
dimension: 0
m_DataSize: 448
_typelessdata: 00000000000080bf000000000000000000000000000080bf0000803f0000000000000000000080bf00000000000080bfaed8a33c0bd7a33c000060c1000080bf000000000000000000000000000080bf0000803f0000000000000000000080bf000060c1000080bf1a467b3f0bd7a33c0000000000008040000000000000000000000000000080bf0000803f0000000000000000000080bf00000000000080400bd7a33c6d10ba3e000060c100008040000000000000000000000000000080bf0000803f0000000000000000000080bf000060c1000080400d467b3f6d10ba3e000060c1000080bf0000000000000000000080bf00000000000080bf0000000000000000000080bf00006041000000000bd7a33cdd4dc43e00000000000080bf0000000000000000000080bf00000000000080bf0000000000000000000080bf000000000000000016467b3fdd4dc43e000060c1000080bf0000803f00000000000080bf00000000000080bf0000000000000000000080bf000060410000803f91d7a33c0f78e73e00000000000080bf0000803f00000000000080bf00000000000080bf0000000000000000000080bf000000000000803f1a467b3f0f78e73e
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: -7, y: 1.5, z: 0.5}
m_Extent: {x: 7, y: 2.5, z: 0.5}
m_MeshUsageFlags: 0
m_BakedConvexCollisionMesh:
m_BakedTriangleCollisionMesh:
m_MeshMetrics[0]: 1
m_MeshMetrics[1]: 1
m_MeshOptimizationFlags: 1
m_StreamData:
serializedVersion: 2
offset: 0
size: 0
path:
--- !u!1001 &421181811
PrefabInstance:
m_ObjectHideFlags: 0
@ -3678,10 +3988,8 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1888977164}
- {fileID: 1288997560}
- {fileID: 132577122}
m_Father: {fileID: 0}
m_RootOrder: 15
m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &466555361
GameObject:
@ -4237,7 +4545,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3674349604157782260, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3}
propertyPath: m_RootOrder
value: 0
value: 2
objectReference: {fileID: 0}
- target: {fileID: 3674349604157782260, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3}
propertyPath: m_LocalScale.z
@ -4245,15 +4553,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3674349604157782260, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3}
propertyPath: m_LocalPosition.x
value: 0.07455039
value: -0.0024496093
objectReference: {fileID: 0}
- target: {fileID: 3674349604157782260, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3}
propertyPath: m_LocalPosition.y
value: -1.160781
value: -0.33978105
objectReference: {fileID: 0}
- target: {fileID: 3674349604157782260, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3}
propertyPath: m_LocalPosition.z
value: 1.7808769
value: -0.010123134
objectReference: {fileID: 0}
- target: {fileID: 3674349604157782260, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3}
propertyPath: m_LocalRotation.w
@ -4314,10 +4622,6 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 4911900090976555143, guid: f494ea85b1685cb43b8956b1a1ccaaa2, type: 3}
propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 8313892792006525421, guid: f494ea85b1685cb43b8956b1a1ccaaa2, type: 3}
propertyPath: m_RootOrder
value: 1
@ -6547,7 +6851,7 @@ Mesh:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: pb_Mesh24160
m_Name: pb_Mesh24150
serializedVersion: 10
m_SubMeshes:
- serializedVersion: 2
@ -7167,7 +7471,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: -8679921383154817045, guid: d8a039318f27391cdb025c7bd542c092, type: 3}
propertyPath: m_RootOrder
value: 20
value: 19
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: d8a039318f27391cdb025c7bd542c092, type: 3}
propertyPath: m_LocalPosition.x
@ -7609,7 +7913,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: -8679921383154817045, guid: d8a039318f27391cdb025c7bd542c092, type: 3}
propertyPath: m_RootOrder
value: 5
value: 4
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: d8a039318f27391cdb025c7bd542c092, type: 3}
propertyPath: m_LocalPosition.x
@ -8259,19 +8563,19 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5367457311287030540, guid: ab468a82ad445da4e9a084297505261f, type: 3}
propertyPath: m_RootOrder
value: 1
value: 3
objectReference: {fileID: 0}
- target: {fileID: 5367457311287030540, guid: ab468a82ad445da4e9a084297505261f, type: 3}
propertyPath: m_LocalPosition.x
value: -1.5334125
value: -1.6104125
objectReference: {fileID: 0}
- target: {fileID: 5367457311287030540, guid: ab468a82ad445da4e9a084297505261f, type: 3}
propertyPath: m_LocalPosition.y
value: -0.9956597
value: -0.17465973
objectReference: {fileID: 0}
- target: {fileID: 5367457311287030540, guid: ab468a82ad445da4e9a084297505261f, type: 3}
propertyPath: m_LocalPosition.z
value: 1.7768617
value: -0.014138341
objectReference: {fileID: 0}
- target: {fileID: 5367457311287030540, guid: ab468a82ad445da4e9a084297505261f, type: 3}
propertyPath: m_LocalRotation.w
@ -8535,7 +8839,7 @@ Transform:
- {fileID: 2128333932}
- {fileID: 197140882}
m_Father: {fileID: 0}
m_RootOrder: 10
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &815680570
PrefabInstance:
@ -9350,7 +9654,7 @@ Transform:
- {fileID: 193352390}
- {fileID: 1967593823}
m_Father: {fileID: 0}
m_RootOrder: 11
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &933062237
PrefabInstance:
@ -9447,7 +9751,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2996515769384266075, guid: fa4ac501e4c6a288483bbfa0e81e97f6, type: 3}
propertyPath: m_RootOrder
value: 16
value: 15
objectReference: {fileID: 0}
- target: {fileID: 2996515769384266075, guid: fa4ac501e4c6a288483bbfa0e81e97f6, type: 3}
propertyPath: m_LocalPosition.x
@ -9894,7 +10198,7 @@ Mesh:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: pb_Mesh24234
m_Name: pb_Mesh24224
serializedVersion: 10
m_SubMeshes:
- serializedVersion: 2
@ -10096,7 +10400,7 @@ Transform:
- {fileID: 1557224834}
- {fileID: 133861093}
m_Father: {fileID: 0}
m_RootOrder: 8
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1180503447
PrefabInstance:
@ -10239,7 +10543,7 @@ PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 435302310}
m_TransformParent: {fileID: 1888977164}
m_Modifications:
- target: {fileID: -4025371315460726001, guid: fde4367ea6917fe43b9f69a154c145c1, type: 3}
propertyPath: showLeftPreview
@ -10251,27 +10555,27 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6291597597410968062, guid: fde4367ea6917fe43b9f69a154c145c1, type: 3}
propertyPath: m_RootOrder
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6291597597410968062, guid: fde4367ea6917fe43b9f69a154c145c1, type: 3}
propertyPath: m_LocalScale.y
value: 0.20531805
value: 0.20531806
objectReference: {fileID: 0}
- target: {fileID: 6291597597410968062, guid: fde4367ea6917fe43b9f69a154c145c1, type: 3}
propertyPath: m_LocalScale.z
value: 0.2053179
value: 0.20531791
objectReference: {fileID: 0}
- target: {fileID: 6291597597410968062, guid: fde4367ea6917fe43b9f69a154c145c1, type: 3}
propertyPath: m_LocalPosition.x
value: 0.5339
value: 0.4568998
objectReference: {fileID: 0}
- target: {fileID: 6291597597410968062, guid: fde4367ea6917fe43b9f69a154c145c1, type: 3}
propertyPath: m_LocalPosition.y
value: -0.448
value: 0.37300003
objectReference: {fileID: 0}
- target: {fileID: 6291597597410968062, guid: fde4367ea6917fe43b9f69a154c145c1, type: 3}
propertyPath: m_LocalPosition.z
value: 1.5559
value: -0.23510015
objectReference: {fileID: 0}
- target: {fileID: 6291597597410968062, guid: fde4367ea6917fe43b9f69a154c145c1, type: 3}
propertyPath: m_LocalRotation.w
@ -10325,7 +10629,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 447954, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3}
propertyPath: m_RootOrder
value: 6
value: 5
objectReference: {fileID: 0}
- target: {fileID: 447954, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3}
propertyPath: m_LocalPosition.x
@ -10376,7 +10680,7 @@ Mesh:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: pb_Mesh23942
m_Name: pb_Mesh23940
serializedVersion: 10
m_SubMeshes:
- serializedVersion: 2
@ -10625,7 +10929,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: -8679921383154817045, guid: d8a039318f27391cdb025c7bd542c092, type: 3}
propertyPath: m_RootOrder
value: 4
value: 3
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: d8a039318f27391cdb025c7bd542c092, type: 3}
propertyPath: m_LocalPosition.x
@ -11239,7 +11543,7 @@ Transform:
- {fileID: 1620530528}
- {fileID: 788326936}
m_Father: {fileID: 0}
m_RootOrder: 12
m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1557224832
GameObject:
@ -11540,7 +11844,7 @@ Transform:
- {fileID: 815680571}
- {fileID: 2061626855}
m_Father: {fileID: 0}
m_RootOrder: 14
m_RootOrder: 13
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1695254330
PrefabInstance:
@ -11647,7 +11951,7 @@ Transform:
- {fileID: 1695254331}
- {fileID: 1180503448}
m_Father: {fileID: 0}
m_RootOrder: 9
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1727196003
PrefabInstance:
@ -11740,7 +12044,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: -8679921383154817045, guid: d8a039318f27391cdb025c7bd542c092, type: 3}
propertyPath: m_RootOrder
value: 19
value: 18
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: d8a039318f27391cdb025c7bd542c092, type: 3}
propertyPath: m_LocalPosition.x
@ -12076,7 +12380,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: -8679921383154817045, guid: d8a039318f27391cdb025c7bd542c092, type: 3}
propertyPath: m_RootOrder
value: 17
value: 16
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: d8a039318f27391cdb025c7bd542c092, type: 3}
propertyPath: m_LocalPosition.x
@ -12888,10 +13192,12 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1888977163}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalPosition: {x: 0.077, y: -0.821, z: 1.791}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1288997560}
- {fileID: 132577122}
- {fileID: 472164268}
- {fileID: 802860442}
- {fileID: 242326303}
@ -14260,7 +14566,7 @@ Mesh:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: pb_Mesh23880
m_Name: pb_Mesh44742
serializedVersion: 10
m_SubMeshes:
- serializedVersion: 2
@ -14763,11 +15069,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 589337997038399236, guid: ec717aa9a84ac1849bec0aa4f4b89314, type: 3}
propertyPath: m_LocalRotation.w
value: 0.6883546
value: 0.99965733
objectReference: {fileID: 0}
- target: {fileID: 589337997038399236, guid: ec717aa9a84ac1849bec0aa4f4b89314, type: 3}
propertyPath: m_LocalRotation.x
value: -0.72537434
value: -0.026176924
objectReference: {fileID: 0}
- target: {fileID: 589337997038399236, guid: ec717aa9a84ac1849bec0aa4f4b89314, type: 3}
propertyPath: m_LocalRotation.y
@ -14779,7 +15085,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 589337997038399236, guid: ec717aa9a84ac1849bec0aa4f4b89314, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: -93
value: -3
objectReference: {fileID: 0}
- target: {fileID: 589337997038399236, guid: ec717aa9a84ac1849bec0aa4f4b89314, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
@ -14890,7 +15196,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5554971243091150254, guid: 124ae331af1b2e845b7de5a2ccb168d4, type: 3}
propertyPath: m_LocalPosition.y
value: 0.445
value: 0.26099998
objectReference: {fileID: 0}
- target: {fileID: 5554971243091150254, guid: 124ae331af1b2e845b7de5a2ccb168d4, type: 3}
propertyPath: m_LocalPosition.z
@ -15067,7 +15373,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1251059359212923921, guid: c1bebd6efa306204bb0978afc704a746, type: 3}
propertyPath: m_LocalPosition.y
value: 0.22390294
value: 0.254
objectReference: {fileID: 0}
- target: {fileID: 1251059359212923921, guid: c1bebd6efa306204bb0978afc704a746, type: 3}
propertyPath: m_LocalPosition.z
@ -15239,7 +15545,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1527984575184472644, guid: 1805c511e7b7f0e49afb0651e27725b4, type: 3}
propertyPath: m_RootOrder
value: 7
value: 6
objectReference: {fileID: 0}
- target: {fileID: 1527984575184472644, guid: 1805c511e7b7f0e49afb0651e27725b4, type: 3}
propertyPath: m_LocalPosition.x
@ -15303,85 +15609,28 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 1805c511e7b7f0e49afb0651e27725b4, type: 3}
--- !u!1001 &6959955265413685872
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 8313892792006525421, guid: f494ea85b1685cb43b8956b1a1ccaaa2, type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8313892792006525421, guid: f494ea85b1685cb43b8956b1a1ccaaa2, type: 3}
propertyPath: m_LocalPosition.x
value: 5.44
objectReference: {fileID: 0}
- target: {fileID: 8313892792006525421, guid: f494ea85b1685cb43b8956b1a1ccaaa2, type: 3}
propertyPath: m_LocalPosition.y
value: 1.092
objectReference: {fileID: 0}
- target: {fileID: 8313892792006525421, guid: f494ea85b1685cb43b8956b1a1ccaaa2, type: 3}
propertyPath: m_LocalPosition.z
value: 3.453
objectReference: {fileID: 0}
- target: {fileID: 8313892792006525421, guid: f494ea85b1685cb43b8956b1a1ccaaa2, type: 3}
propertyPath: m_LocalRotation.w
value: 0.7071067
objectReference: {fileID: 0}
- target: {fileID: 8313892792006525421, guid: f494ea85b1685cb43b8956b1a1ccaaa2, type: 3}
propertyPath: m_LocalRotation.x
value: -0.7071068
objectReference: {fileID: 0}
- target: {fileID: 8313892792006525421, guid: f494ea85b1685cb43b8956b1a1ccaaa2, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8313892792006525421, guid: f494ea85b1685cb43b8956b1a1ccaaa2, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8313892792006525421, guid: f494ea85b1685cb43b8956b1a1ccaaa2, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8313892792006525421, guid: f494ea85b1685cb43b8956b1a1ccaaa2, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8313892792006525421, guid: f494ea85b1685cb43b8956b1a1ccaaa2, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8659069540560968535, guid: f494ea85b1685cb43b8956b1a1ccaaa2, type: 3}
propertyPath: m_Name
value: prises_12
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: f494ea85b1685cb43b8956b1a1ccaaa2, type: 3}
--- !u!1001 &7278954555104977257
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 435302310}
m_TransformParent: {fileID: 1888977164}
m_Modifications:
- target: {fileID: 7101811468694509626, guid: cbdff3e37c153cc48b95d4374a38eed9, type: 3}
propertyPath: m_RootOrder
value: 2
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7101811468694509626, guid: cbdff3e37c153cc48b95d4374a38eed9, type: 3}
propertyPath: m_LocalPosition.x
value: -0.16844964
value: -0.24544963
objectReference: {fileID: 0}
- target: {fileID: 7101811468694509626, guid: cbdff3e37c153cc48b95d4374a38eed9, type: 3}
propertyPath: m_LocalPosition.y
value: -0.41
value: 0.411
objectReference: {fileID: 0}
- target: {fileID: 7101811468694509626, guid: cbdff3e37c153cc48b95d4374a38eed9, type: 3}
propertyPath: m_LocalPosition.z
value: 1.597
value: -0.19400012
objectReference: {fileID: 0}
- target: {fileID: 7101811468694509626, guid: cbdff3e37c153cc48b95d4374a38eed9, type: 3}
propertyPath: m_LocalRotation.w

48
Assets/Scripts/Catalog.cs
View File

@ -1,3 +1,4 @@
using JetBrains.Annotations;
using System;
using System.Collections;
using System.Collections.Generic;
@ -57,15 +58,7 @@ public class Catalog : MonoBehaviour
sphere.transform.localScale = Vector3.one * objectScale;
sphere.transform.localPosition = new Vector3(Mathf.Sin(j), 0, Mathf.Cos(j)) * distance;
sphere.SetActive(true);
GameObject furniture = Instantiate(Furnitures[i]);
furniture.transform.parent = sphere.transform;
Furniture objectBounds = furniture.GetComponent<Furniture>();
objectBounds.CalculateBounds();
float rescale = (objectScale / 1.4f) / objectBounds.combinedBounds.size.magnitude;
furniture.transform.localScale *= rescale;
furniture.transform.localPosition = Vector3.down * 0.2f;
sphere.GetComponent<CatalogElement>().SetFurniture(Furnitures[i], objectScale);
}
StartCoroutine(CatalogCoroutine());
}
@ -86,28 +79,16 @@ public class Catalog : MonoBehaviour
{
var sphere = Instantiate(spherePrefab);
sphere.transform.localScale = Vector3.one * objectScale;
GameObject furrnitureBall = Instantiate(furniture);
furrnitureBall.transform.parent = sphere.transform;
Furniture objectBounds = furrnitureBall.GetComponent<Furniture>();
if (!objectBounds)
{
objectBounds = furrnitureBall.AddComponent<Furniture>();
}
objectBounds.CalculateBounds();
float rescale = (objectScale / 1.4f) / objectBounds.combinedBounds.size.magnitude;
furrnitureBall.transform.localScale *= rescale;
furrnitureBall.transform.localPosition = Vector3.down * 0.2f;
sphere.SetActive(true);
//hand.GetGrabStarting
hand.AttachObject(sphere, GrabTypes.Trigger);
sphere.GetComponent<CatalogElement>().SetFurniture(furniture, objectScale);
hand.AttachObject(sphere, GrabTypes.Grip);
currentSphere = sphere;
}
public void ReleaseObject(GameObject furniture, Valve.VR.InteractionSystem.Hand hand)
{
hand.DetachObject(currentSphere);
currentSphere = null;
}
@ -124,15 +105,26 @@ public class Catalog : MonoBehaviour
}
}
public void OnGrabSphere(CatalogElement sphere)
public void OnGrabSphere(CatalogElement sphere, Valve.VR.InteractionSystem.Hand hand)
{
MovableFurniture grab = hand.GetComponent<FurnitureMover>().Grabbing;
if (grab != null)
{
return;
}
GameObject furniture = Instantiate(sphere.largeFurnitureModel);
MovableFurniture script = furniture.GetComponent<MovableFurniture>() ;
if (!furniture.GetComponent<MovableFurniture>())
{
script = furniture.AddComponent<MovableFurniture>();
}
script.CalculateBounds();
hand.GetComponent<FurnitureMover>().Grabbing = script;
}
public void OnReleaseSphere(CatalogElement sphere, Valve.VR.InteractionSystem.Hand hand)
{
hand.DetachObject(sphere.gameObject);
hand.GetComponent<FurnitureMover>().Grabbing = null;
}

47
Assets/Scripts/Catalog.prefab
View File

@ -71,7 +71,6 @@ GameObject:
- component: {fileID: 1321968106976948543}
- component: {fileID: 3556194868201819980}
- component: {fileID: 610733981179356279}
- component: {fileID: 4031061050250264179}
- component: {fileID: 5534794128165569389}
m_Layer: 0
m_Name: Sphere
@ -268,7 +267,7 @@ Rigidbody:
m_Interpolate: 0
m_Constraints: 126
m_CollisionDetection: 0
--- !u!114 &4031061050250264179
--- !u!114 &5534794128165569389
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@ -277,7 +276,7 @@ MonoBehaviour:
m_GameObject: {fileID: 6275806258134515848}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ffefbea063cab884ca33e5a449e5c22c, type: 3}
m_Script: {fileID: 11500000, guid: 6be44b6db6259b44aa167854e71e96f9, type: 3}
m_Name:
m_EditorClassIdentifier:
attachmentFlags: 44
@ -311,50 +310,14 @@ MonoBehaviour:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
restoreOriginalParent: 1
restoreOriginalParent: 0
onPickUp:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 5534794128165569389}
m_TargetAssemblyTypeName: CatalogElement, Assembly-CSharp
m_MethodName: OnGrabSphere
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_Calls: []
onDetachFromHand:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 5534794128165569389}
m_TargetAssemblyTypeName: CatalogElement, Assembly-CSharp
m_MethodName: OnReleaseSphere
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_Calls: []
onHeldUpdate:
m_PersistentCalls:
m_Calls: []
interactable: {fileID: 0}
--- !u!114 &5534794128165569389
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6275806258134515848}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6be44b6db6259b44aa167854e71e96f9, type: 3}
m_Name:
m_EditorClassIdentifier:

78
Assets/Scripts/CatalogElement.cs
View File

@ -2,10 +2,13 @@ using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.Events;
using UnityEngine.ProBuilder.Shapes;
using Valve.VR.InteractionSystem;
public class CatalogElement : MonoBehaviour
public class CatalogElement : Throwable
{
public GameObject largeFurnitureModel;
private GameObject smallFurnitureModel;
private Vector3 returnPosition;
// Start is called before the first frame update
void Start()
@ -19,17 +22,74 @@ public class CatalogElement : MonoBehaviour
}
public void OnGrabSphere()
protected override void OnAttachedToHand(Hand hand)
{
//Debug.Log("<b>[SteamVR Interaction]</b> Pickup: " + hand.GetGrabStarting().ToString());
hadInterpolation = this.rigidbody.interpolation;
attached = true;
onPickUp.Invoke();
hand.HoverLock(null);
rigidbody.interpolation = RigidbodyInterpolation.None;
attachTime = Time.time;
attachPosition = transform.position;
attachRotation = transform.rotation;
Catalog.Instance.OnGrabSphere(this, hand);
//hand.GetComponent<FurnitureMover>().Grabbing = largeFurnitureModel.GetComponent<MovableFurniture>();
}
public void OnReleaseSphere()
//-------------------------------------------------
protected override void OnDetachedFromHand(Hand hand)
{
//StartCoroutine(ReturnSphere());
//Destroy(gameObject);
attached = false;
onDetachFromHand.Invoke();
hand.HoverUnlock(null);
rigidbody.interpolation = hadInterpolation;
Catalog.Instance.OnReleaseSphere(this, hand);
Destroy(gameObject);
}
public void SetFurniture(GameObject furniture, float objectScale)
{
largeFurnitureModel = furniture;
smallFurnitureModel = Instantiate(furniture);
var throwables = smallFurnitureModel.GetComponentsInChildren<Throwable>();
foreach (Throwable throwable in throwables)
{
Destroy(throwable);
};
var rigidbodies = smallFurnitureModel.GetComponentsInChildren<Rigidbody>();
foreach (Rigidbody rigidbody in rigidbodies)
{
Destroy(rigidbody);
};
smallFurnitureModel.transform.parent = transform;
Destroy(smallFurnitureModel.GetComponent<MovableFurniture>());
Furniture objectBounds = smallFurnitureModel.AddComponent<Furniture>();
objectBounds.CalculateBounds();
var colldiers = smallFurnitureModel.GetComponentsInChildren<Collider>();
foreach (Collider collider in colldiers)
{
Destroy(collider);
};
float rescale = (objectScale / 1.4f) / objectBounds.combinedBounds.size.magnitude;
smallFurnitureModel.transform.localScale *= rescale;
smallFurnitureModel.transform.localPosition = Vector3.down * 0.2f;
StartCoroutine(KeepFurnitureAligned());
}
private IEnumerator ReturnSphere()
{
float time = 0;
@ -42,4 +102,12 @@ public class CatalogElement : MonoBehaviour
}
yield break;
}
private IEnumerator KeepFurnitureAligned() {
while (true)
{
smallFurnitureModel.transform.eulerAngles = new Vector3(0, smallFurnitureModel.transform.eulerAngles.y-(20*Time.deltaTime), 0);
yield return null;
}
}
}

8
Assets/Scripts/FurnitureMover.cs
View File

@ -19,7 +19,7 @@ public class FurnitureMover : MonoBehaviour
public LayerMask AutoPlacementEnvironmentMask;
public GameObject pointer;
private MovableFurniture Grabbing;
public MovableFurniture Grabbing;
public Color color;
public float thickness = 0.002f;
@ -58,7 +58,7 @@ public class FurnitureMover : MonoBehaviour
BoxCollider collider = pointer.GetComponent<BoxCollider>();
if (collider)
{
Object.Destroy(collider);
Destroy(collider);
}
Material newMaterial = new Material(Shader.Find("Unlit/Color"));
newMaterial.SetColor("_Color", color);
@ -184,6 +184,10 @@ public class FurnitureMover : MonoBehaviour
}
private void OnPointerClickDown(object sender, PointerEventArgs e)
{
if (Grabbing)
{
return;
}
MovableFurniturePart clickHandler = e.target.GetComponent<MovableFurniturePart>();
if (clickHandler == null)
{

13
Assets/Scripts/MovableFurniture.cs
View File

@ -20,6 +20,7 @@ public class MovableFurniture : Furniture
var part = child.gameObject.AddComponent<MovableFurniturePart>();
part.parent = this;
var outline = child.gameObject.AddComponent<ObjectOutline>();
if (!outline) continue;
outlines.Add(outline);
outline.OutlineMode = ObjectOutline.Mode.OutlineAll;
outline.OutlineColor = Color.yellow;
@ -153,4 +154,16 @@ public class MovableFurniture : Furniture
Gizmos.DrawRay((transform.position - centerOffset) - (new Vector3(0, 0, combinedBounds.extents.z)), (new Vector3(0, 0, combinedBounds.size.z)));
}
private void OnDisable()
{
if(outlines != null && outlines.Count > 0)
{
foreach (ObjectOutline outline in outlines)
{
outline.enabled = false;
}
}
}
}

BIN
Assets/Texture/Circuitboard_Occlusion.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

123
Assets/Texture/Circuitboard_Occlusion.png.meta Normal file
View File

@ -0,0 +1,123 @@
fileFormatVersion: 2
guid: ef9c5573265abac4fbe691e4c7daea7f
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMasterTextureLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Server
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Texture/Plant_Occlusion.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

123
Assets/Texture/Plant_Occlusion.png.meta Normal file
View File

@ -0,0 +1,123 @@
fileFormatVersion: 2
guid: bac0648176894df43ad96f883ef0a7dc
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMasterTextureLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Server
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Texture/Pot_Occlusion.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

123
Assets/Texture/Pot_Occlusion.png.meta Normal file
View File

@ -0,0 +1,123 @@
fileFormatVersion: 2
guid: 90a94831c54b1d94c809633460b7cd23
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMasterTextureLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Server
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Texture/Ultimaker_occlusion.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

123
Assets/Texture/Ultimaker_occlusion.png.meta Normal file
View File

@ -0,0 +1,123 @@
fileFormatVersion: 2
guid: 3f329616a16a9b54bb92813ac2048319
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMasterTextureLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Server
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant: