Change file hierarchy

2023-01-16 15:16:34 +01:00 · 2023-01-16 15:16:34 +01:00 · ac3c539569
commit ac3c539569
parent 26a5ca130c
6 changed files with 116 additions and 119 deletions
--- a/Assets/Scenes/FabLab/FabLab.unity
+++ b/Assets/Scenes/FabLab/FabLab.unity
@ -4140,118 +4140,6 @@ Transform:
  m_CorrespondingSourceObject: {fileID: 3674349604157782260, guid: b4f1c52a4d9acc94da08e9006d9fd5e0, type: 3}
  m_PrefabInstance: {fileID: 472164267}
  m_PrefabAsset: {fileID: 0}
--- !u!1 &517030984 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 6275806258134515848, guid: 1805c511e7b7f0e49afb0651e27725b4, type: 3}
-  m_PrefabInstance: {fileID: 1527984575637916537}
-  m_PrefabAsset: {fileID: 0}
--- !u!114 &517030986
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 517030984}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: ffefbea063cab884ca33e5a449e5c22c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  attachmentFlags: 44
-  attachmentOffset: {fileID: 0}
-  catchingSpeedThreshold: -1
-  releaseVelocityStyle: 1
-  releaseVelocityTimeOffset: -0.011
-  scaleReleaseVelocity: 1.1
-  scaleReleaseVelocityThreshold: -1
-  scaleReleaseVelocityCurve:
-    serializedVersion: 2
-    m_Curve:
-    - serializedVersion: 3
-      time: 0
-      value: 0.1
-      inSlope: 0
-      outSlope: 0
-      tangentMode: 0
-      weightedMode: 0
-      inWeight: 0
-      outWeight: 0
-    - serializedVersion: 3
-      time: 1
-      value: 1
-      inSlope: 0
-      outSlope: 0
-      tangentMode: 0
-      weightedMode: 0
-      inWeight: 0
-      outWeight: 0
-    m_PreInfinity: 2
-    m_PostInfinity: 2
-    m_RotationOrder: 4
-  restoreOriginalParent: 1
-  onPickUp:
-    m_PersistentCalls:
-      m_Calls:
-      - m_Target: {fileID: 517030994}
-        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
-  onDetachFromHand:
-    m_PersistentCalls:
-      m_Calls:
-      - m_Target: {fileID: 517030994}
-        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
-  onHeldUpdate:
-    m_PersistentCalls:
-      m_Calls: []
-  interactable: {fileID: 0}
--- !u!54 &517030987
-Rigidbody:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 517030984}
-  serializedVersion: 2
-  m_Mass: 1
-  m_Drag: 0
-  m_AngularDrag: 0.05
-  m_UseGravity: 0
-  m_IsKinematic: 0
-  m_Interpolate: 0
-  m_Constraints: 126
-  m_CollisionDetection: 0
--- !u!114 &517030994
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 517030984}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 6be44b6db6259b44aa167854e71e96f9, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  returnPosition: {x: 0, y: 0, z: 0}
 --- !u!1001 &527112787
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -13041,13 +12929,9 @@ PrefabInstance:
      propertyPath: m_ConstrainProportionsScale
      value: 1
      objectReference: {fileID: 0}
-    - target: {fileID: 3102087200456469538, guid: 1805c511e7b7f0e49afb0651e27725b4, type: 3}
-      propertyPath: hideHandOnAttach
-      value: 0
-      objectReference: {fileID: 0}
    - target: {fileID: 6275806258134515848, guid: 1805c511e7b7f0e49afb0651e27725b4, type: 3}
      propertyPath: m_IsActive
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 1805c511e7b7f0e49afb0651e27725b4, type: 3}
--- a/Assets/Scripts/Catalog.cs
+++ b/Assets/Scripts/Catalog.cs
@ -1,4 +1,5 @@
 using System.Collections;
+using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 using UnityEngine;
 using UnityEngine.ProBuilder.Shapes;
@ -15,6 +16,8 @@ public class Catalog : MonoBehaviour
    private GameObject spherePrefab;

    private Vector3 sphereReturn;
+
+    public List<GameObject> Furnitures= new List<GameObject>();
    // Start is called before the first frame update
    void Start()
    {
--- a/Assets/Scripts/Catalog.cs.meta
+++ b/Assets/Scripts/Catalog.cs.meta
--- a/Assets/Scripts/Catalog.prefab
+++ b/Assets/Scripts/Catalog.prefab
@ -64,6 +64,9 @@ GameObject:
  - component: {fileID: 5004594542533833549}
  - component: {fileID: 1321968106976948543}
  - component: {fileID: 3556194868201819980}
+  - component: {fileID: 610733981179356279}
+  - component: {fileID: 4031061050250264179}
+  - component: {fileID: 5534794128165569389}
  m_Layer: 0
  m_Name: Sphere
  m_TagString: Untagged
@ -100,7 +103,7 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  activateActionSetOnAttach:
    actionSetPath: 
-  hideHandOnAttach: 1
+  hideHandOnAttach: 0
  hideSkeletonOnAttach: 0
  hideControllerOnAttach: 0
  handAnimationOnPickup: 0
@ -243,3 +246,110 @@ SphereCollider:
  serializedVersion: 2
  m_Radius: 0.5
  m_Center: {x: 0, y: 0, z: 0}
+--- !u!54 &610733981179356279
+Rigidbody:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6275806258134515848}
+  serializedVersion: 2
+  m_Mass: 1
+  m_Drag: 0
+  m_AngularDrag: 0.05
+  m_UseGravity: 0
+  m_IsKinematic: 0
+  m_Interpolate: 0
+  m_Constraints: 126
+  m_CollisionDetection: 0
+--- !u!114 &4031061050250264179
+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: ffefbea063cab884ca33e5a449e5c22c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  attachmentFlags: 44
+  attachmentOffset: {fileID: 0}
+  catchingSpeedThreshold: -1
+  releaseVelocityStyle: 1
+  releaseVelocityTimeOffset: -0.011
+  scaleReleaseVelocity: 1.1
+  scaleReleaseVelocityThreshold: -1
+  scaleReleaseVelocityCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0.1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0
+      outWeight: 0
+    - serializedVersion: 3
+      time: 1
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0
+      outWeight: 0
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  restoreOriginalParent: 1
+  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
+  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
+  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: 
+  returnPosition: {x: 0, y: 0, z: 0}
--- a/Assets/Scripts/CatalogElement.cs
+++ b/Assets/Scripts/CatalogElement.cs
@ -6,7 +6,7 @@ using Valve.VR.InteractionSystem;

 public class CatalogElement : MonoBehaviour
 {
-    public Vector3 returnPosition;
+    private Vector3 returnPosition;
    // Start is called before the first frame update
    void Start()
    {
--- a/Assets/Scripts/CatalogElement.cs.meta
+++ b/Assets/Scripts/CatalogElement.cs.meta