Merge branch 'Scripting' into Assets

2023-01-16 09:05:05 +01:00 · 2023-01-16 09:05:05 +01:00 · dff6caef6f
commit dff6caef6f
parent de864691a3 414d1eec0e
57 changed files with 1301 additions and 16259 deletions
--- a/Assets/Catalog.cs
+++ b/Assets/Catalog.cs
@ -0,0 +1,71 @@
+using System.Collections;
+using UnityEngine;
+using Valve.VR.InteractionSystem;
+
+public class Catalog : MonoBehaviour
+{
+    private Player player = null;
+    public int maxShownObjects = 5;
+    public int angle = 180;
+    public float distance = .5f;
+    public float objectScale = .1f;
+    // Start is called before the first frame update
+    void Start()
+    {
+        player = Player.instance;
+        if (player == null)
+        {
+            Debug.LogError("<b>[SteamVR Interaction]</b> Teleport: No Player instance found in map.", this);
+            Destroy(this.gameObject);
+            return;
+        }
+        ShowCatalog();
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+    }
+
+    private void ShowCatalog()
+    {
+        gameObject.transform.SetParent(player.hands[0].transform);
+        gameObject.transform.localPosition = Vector3.zero;
+        float radians = angle * Mathf.Deg2Rad;
+        float angleIncrement = radians / (maxShownObjects - 1);
+
+        for (float i = 0 / 2; i < maxShownObjects; i++)
+        {
+            var j = i * angleIncrement - radians / 2;
+            var sphere = GameObject.CreatePrimitive(PrimitiveType.Sphere);
+            sphere.transform.parent = transform;
+            sphere.transform.localScale = Vector3.one * objectScale;
+            sphere.transform.localPosition = new Vector3(Mathf.Sin(j), 0, Mathf.Cos(j)) * distance;
+        }
+
+        StartCoroutine(CatalogCoroutine());
+    }
+
+    private IEnumerator CatalogCoroutine()
+    {
+        var hand = player.hands;
+        while (true)
+        {
+
+            transform.rotation = Quaternion.LookRotation(transform.position - player.hmdTransform.position);
+            transform.rotation = new Quaternion(0, transform.rotation.y, 0, transform.rotation.w);
+            yield return null;
+        }
+    }
+
+    private void OnDrawGizmosSelected()
+    {
+        float radians = angle * Mathf.Deg2Rad;
+        float angleIncrement = radians / (maxShownObjects - 1);
+        for (float i = 0 / 2; i < maxShownObjects; i++)
+        {
+            var j = i * angleIncrement - radians / 2;
+            Gizmos.DrawWireSphere(transform.position + new Vector3(Mathf.Sin(j), 0, Mathf.Cos(j)) * distance, objectScale / 2);
+        }
+    }
+}
--- a/Assets/Catalog.cs.meta
+++ b/Assets/Catalog.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 6e448cbb02ada1545b6c4c79341232fc
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Models/Blender/keyboard.blend1.meta
+++ b/Assets/Models/Blender/keyboard.blend1.meta
@ -1,5 +1,6 @@
 fileFormatVersion: 2
-guid: 7e271bd70c7d61e4bb2480882dfde12c
+guid: 88c951c75d8d97540908f1edc66613c9
+folderAsset: yes
 DefaultImporter:
  externalObjects: {}
  userData: 
--- a/Assets/Editor/ProjectAuditorConfig.asset
+++ b/Assets/Editor/ProjectAuditorConfig.asset
@ -0,0 +1,20 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 424c5a33b3bea46f3bd7ae461a273b6d, type: 3}
+  m_Name: ProjectAuditorConfig
+  m_EditorClassIdentifier: 
+  AnalyzeOnBuild: 0
+  AnalyzeInBackground: 1
+  CompilationMode: 0
+  UseRoslynAnalyzers: 0
+  FailBuildOnIssues: 0
+  m_Rules: []
--- a/Assets/Editor/ProjectAuditorConfig.asset.meta
+++ b/Assets/Editor/ProjectAuditorConfig.asset.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c164f01698d742e4983083d92a7fe2cd
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Materials/Keyboard/Keyboard.mat
+++ b/Assets/Materials/Keyboard/Keyboard.mat
@ -7,7 +7,7 @@ Material:
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_Name: Hologram
+  m_Name: Keyboard
  m_Shader: {fileID: 4800000, guid: 545f09bbeef645047bfe01d94ee1d5e7, type: 3}
  m_ValidKeywords: []
  m_InvalidKeywords: []
--- a/Assets/Materials/Keyboard/Keyboard.mat.meta
+++ b/Assets/Materials/Keyboard/Keyboard.mat.meta
--- a/Assets/Materials/Keyboard/Keyboard.shader
+++ b/Assets/Materials/Keyboard/Keyboard.shader
@ -1,4 +1,4 @@
-Shader "Cg shading in world space" {
+Shader "RGB Keys" {
   SubShader {
      Pass {
         CGPROGRAM
@ -6,21 +6,27 @@ Shader "Cg shading in world space" {
         #pragma vertex vert  
         #pragma fragment frag 
 
+         #include "UnityCG.cginc"
+
         // uniform float4x4 unity_ObjectToWorld; 
            // automatic definition of a Unity-specific uniform parameter

         struct vertexInput {
            float4 vertex : POSITION;
+            UNITY_VERTEX_INPUT_INSTANCE_ID
         };
         struct vertexOutput {
            float4 pos : SV_POSITION;
            float4 position_in_world_space : TEXCOORD0;
+            UNITY_VERTEX_OUTPUT_STEREO
         };

         vertexOutput vert(vertexInput input) 
         {
            vertexOutput output; 
- 
+            UNITY_SETUP_INSTANCE_ID(input);
+            UNITY_INITIALIZE_OUTPUT(vertexOutput, output);
+            UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(output);
            output.pos =  UnityObjectToClipPos(input.vertex);
            output.position_in_world_space = 
               mul(unity_ObjectToWorld, input.vertex);
@ -28,7 +34,7 @@ Shader "Cg shading in world space" {
               // coordinates to world coordinates;
            return output;
         }
- 
+         UNITY_DECLARE_SCREENSPACE_TEXTURE(_MainTex);
         float3 ApplyHue(float t)
         {
             float3 result;
@ -45,7 +51,9 @@ Shader "Cg shading in world space" {
               // computes the distance between the fragment position 
               // and the origin (the 4th coordinate should always be 
               // 1 for points).
-            
+             UNITY_SETUP_STEREO_EYE_INDEX_POST_VERTEX(input)
+             // fixed4 col = UNITY_SAMPLE_SCREENSPACE_TEXTURE(_MainTex, input.position_in_world_space);
+             //col = (ApplyHue(_Time.x*4.), 1.0);
             return float4(ApplyHue(_Time.x*4.), 1.0);
            //return float4(fmod(input.position_in_world_space.x,1), input.position_in_world_space.y % 1, input.position_in_world_space.z % 1, 1.0);
         }
--- a/Assets/Materials/Keyboard/Keyboard.shader.meta
+++ b/Assets/Materials/Keyboard/Keyboard.shader.meta
--- a/Assets/Materials/Keyboard/red.mat
+++ b/Assets/Materials/Keyboard/red.mat
@ -8,7 +8,7 @@ Material:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: red
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Shader: {fileID: 4800000, guid: 545f09bbeef645047bfe01d94ee1d5e7, type: 3}
  m_ValidKeywords: []
  m_InvalidKeywords: []
  m_LightmapFlags: 4
--- a/Assets/Materials/Material.mat
+++ b/Assets/Materials/Material.mat
@ -0,0 +1,86 @@
+%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
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_ValidKeywords:
+  - _METALLICGLOSSMAP
+  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: 0}
+        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: 0aff3df6854d11b4599b809d07bd3ed2, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 2800000, guid: 33ef2905e65468c4a8bdbf7613c47218, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        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}
+    - _SpecGlossMap:
+        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}
+    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+  m_BuildTextureStacks: []
--- a/Assets/Materials/Material.mat.meta
+++ b/Assets/Materials/Material.mat.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1cee05d88bdf344479c996b827ad201c
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Models/Blender/Base_Station.blend.meta
+++ b/Assets/Models/Blender/Base_Station.blend.meta
@ -32,7 +32,7 @@ ModelImporter:
    extraExposedTransformPaths: []
    extraUserProperties: []
    clipAnimations: []
-    isReadable: 0
+    isReadable: 1
  meshes:
    lODScreenPercentages: []
    globalScale: 1
--- a/Assets/Models/Blender/Indoor_plant.blend.meta
+++ b/Assets/Models/Blender/Indoor_plant.blend.meta
@ -32,7 +32,7 @@ ModelImporter:
    extraExposedTransformPaths: []
    extraUserProperties: []
    clipAnimations: []
-    isReadable: 0
+    isReadable: 1
  meshes:
    lODScreenPercentages: []
    globalScale: 1
--- a/Assets/Models/Blender/Indoor_plant_02.blend.meta
+++ b/Assets/Models/Blender/Indoor_plant_02.blend.meta
@ -32,7 +32,7 @@ ModelImporter:
    extraExposedTransformPaths: []
    extraUserProperties: []
    clipAnimations: []
-    isReadable: 0
+    isReadable: 1
  meshes:
    lODScreenPercentages: []
    globalScale: 1
--- a/Assets/Models/Blender/Indoor_plant_02.blend1
+++ b/Assets/Models/Blender/Indoor_plant_02.blend1
--- a/Assets/Models/Blender/Lamp.blend
+++ b/Assets/Models/Blender/Lamp.blend
--- a/Assets/Models/Blender/Logitech_G603_Turbosquid.blend
+++ b/Assets/Models/Blender/Logitech_G603_Turbosquid.blend
--- a/Assets/Models/Blender/Logitech_G603_Turbosquid.blend.meta
+++ b/Assets/Models/Blender/Logitech_G603_Turbosquid.blend.meta
@ -32,7 +32,7 @@ ModelImporter:
    extraExposedTransformPaths: []
    extraUserProperties: []
    clipAnimations: []
-    isReadable: 0
+    isReadable: 1
  meshes:
    lODScreenPercentages: []
    globalScale: 1
--- a/Assets/Models/Blender/Materials/Circuitboard.meta
+++ b/Assets/Models/Blender/Materials/Circuitboard.meta
@ -1,5 +1,6 @@
 fileFormatVersion: 2
-guid: f4154d993193adf4184e2bd352c41503
+guid: 0c4061bc82225b74489c77b544450c46
+folderAsset: yes
 DefaultImporter:
  externalObjects: {}
  userData: 
--- a/Assets/Models/Blender/Monitor.blend.meta
+++ b/Assets/Models/Blender/Monitor.blend.meta
@ -47,7 +47,7 @@ ModelImporter:
    extraExposedTransformPaths: []
    extraUserProperties: []
    clipAnimations: []
-    isReadable: 0
+    isReadable: 1
  meshes:
    lODScreenPercentages: []
    globalScale: 1
--- a/Assets/Models/Blender/NetworkBox.blend.meta
+++ b/Assets/Models/Blender/NetworkBox.blend.meta
@ -32,7 +32,7 @@ ModelImporter:
    extraExposedTransformPaths: []
    extraUserProperties: []
    clipAnimations: []
-    isReadable: 0
+    isReadable: 1
  meshes:
    lODScreenPercentages: []
    globalScale: 1
--- a/Assets/Models/Blender/circuitboard.blend
+++ b/Assets/Models/Blender/circuitboard.blend
--- a/Assets/Models/Blender/circuitboard.blend.meta
+++ b/Assets/Models/Blender/circuitboard.blend.meta
@ -3,7 +3,12 @@ guid: 49362df3fa9630d41bbc0bd46629331f
 ModelImporter:
  serializedVersion: 21300
  internalIDToNameTable: []
-  externalObjects: {}
+  externalObjects:
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: Material
+    second: {fileID: 2100000, guid: 1cee05d88bdf344479c996b827ad201c, type: 2}
  materials:
    materialImportMode: 2
    materialName: 0
--- a/Assets/Models/Blender/computer.blend.meta
+++ b/Assets/Models/Blender/computer.blend.meta
@ -32,7 +32,7 @@ ModelImporter:
    extraExposedTransformPaths: []
    extraUserProperties: []
    clipAnimations: []
-    isReadable: 0
+    isReadable: 1
  meshes:
    lODScreenPercentages: []
    globalScale: 1
--- a/Assets/Models/Blender/hammer.blend
+++ b/Assets/Models/Blender/hammer.blend
--- a/Assets/Models/Blender/keyboard.blend
+++ b/Assets/Models/Blender/keyboard.blend
--- a/Assets/Models/Blender/keyboard.blend.meta
+++ b/Assets/Models/Blender/keyboard.blend.meta
@ -107,7 +107,7 @@ ModelImporter:
    extraExposedTransformPaths: []
    extraUserProperties: []
    clipAnimations: []
-    isReadable: 0
+    isReadable: 1
  meshes:
    lODScreenPercentages: []
    globalScale: 1
--- a/Assets/Models/Blender/keyboard.blend1
+++ b/Assets/Models/Blender/keyboard.blend1
--- a/Assets/Models/Blender/laser_cutter.blend.meta
+++ b/Assets/Models/Blender/laser_cutter.blend.meta
@ -32,7 +32,7 @@ ModelImporter:
    extraExposedTransformPaths: []
    extraUserProperties: []
    clipAnimations: []
-    isReadable: 0
+    isReadable: 1
  meshes:
    lODScreenPercentages: []
    globalScale: 1
--- a/Assets/Models/Blender/pliers.blend
+++ b/Assets/Models/Blender/pliers.blend
--- a/Assets/Models/Blender/pliers.blend.meta
+++ b/Assets/Models/Blender/pliers.blend.meta
@ -68,8 +68,8 @@ ModelImporter:
    secondaryUVPackMargin: 4
    useFileScale: 1
  tangentSpace:
-    normalSmoothAngle: 60
-    normalImportMode: 0
+    normalSmoothAngle: 45
+    normalImportMode: 1
    tangentImportMode: 3
    normalCalculationMode: 4
    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
--- a/Assets/Models/Blender/screwdriver.blend.meta
+++ b/Assets/Models/Blender/screwdriver.blend.meta
@ -47,7 +47,7 @@ ModelImporter:
    extraExposedTransformPaths: []
    extraUserProperties: []
    clipAnimations: []
-    isReadable: 0
+    isReadable: 1
  meshes:
    lODScreenPercentages: []
    globalScale: 1
--- a/Assets/Models/Blender/shelf.blend.meta
+++ b/Assets/Models/Blender/shelf.blend.meta
@ -42,7 +42,7 @@ ModelImporter:
    extraExposedTransformPaths: []
    extraUserProperties: []
    clipAnimations: []
-    isReadable: 0
+    isReadable: 1
  meshes:
    lODScreenPercentages: []
    globalScale: 1
--- a/Assets/Models/Keyboard.prefab
+++ b/Assets/Models/Keyboard.prefab
--- a/Assets/Models/Keyboard.prefab.meta
+++ b/Assets/Models/Keyboard.prefab.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: b6e04371fb6e5d4488dd1167ef14299f
+guid: cbdff3e37c153cc48b95d4374a38eed9
 PrefabImporter:
  externalObjects: {}
  userData: 
--- a/Assets/Models/Lamp.prefab
+++ b/Assets/Models/Lamp.prefab
@ -30,7 +30,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 905368309636460435}
-  m_RootOrder: 10
+  m_RootOrder: 2
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!108 &6774370061540394056
 Light:
@ -191,7 +191,7 @@ PrefabInstance:
      objectReference: {fileID: 2100000, guid: ff3ca534769e99b428e81eb2a5dea4bf, type: 2}
    - target: {fileID: -7029948723529949830, guid: 2d215d829a7ab10408170d7036d2728a, type: 3}
      propertyPath: m_IsActive
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: -7029948723529949830, guid: 2d215d829a7ab10408170d7036d2728a, type: 3}
      propertyPath: m_StaticEditorFlags
--- a/Assets/Models/Mouse.prefab
+++ b/Assets/Models/Mouse.prefab
@ -41,7 +41,7 @@ MeshFilter:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 6605845652538914080}
-  m_Mesh: {fileID: -3796887150266652070, guid: 2c680f33e3b2a354795f5bb9d9c1f65c, type: 3}
+  m_Mesh: {fileID: 6605384932166185756, guid: 2c680f33e3b2a354795f5bb9d9c1f65c, type: 3}
 --- !u!23 &9198014314391204201
 MeshRenderer:
  m_ObjectHideFlags: 0
--- a/Assets/Models/UM3_UM3_Ultimaker.prefab
+++ b/Assets/Models/UM3_UM3_Ultimaker.prefab
@ -11,6 +11,7 @@ GameObject:
  - component: {fileID: 5569992116628908473}
  - component: {fileID: 2472856654148928913}
  - component: {fileID: 3727303620116880137}
+  - component: {fileID: 2376179122941027147}
  m_Layer: 0
  m_Name: UM3_UM3_Ultimaker
  m_TagString: Untagged
@ -83,3 +84,15 @@ MeshRenderer:
  m_SortingLayer: 0
  m_SortingOrder: 0
  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!114 &2376179122941027147
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6042578527978222026}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7310167259df75745b825087bf4c8de0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
--- a/Assets/Models/chair.prefab
+++ b/Assets/Models/chair.prefab
@ -186,38 +186,6 @@ MeshCollider:
  m_Convex: 1
  m_CookingOptions: 30
  m_Mesh: {fileID: -3183339516574119901, guid: 61dd8047e5e66dc4db5c150abe38beae, type: 3}
--- !u!114 &1204935884
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 749501648960564542}
-  m_Enabled: 0
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d2fe5546f775c47d2820aa5e8a715f53, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  _data:
-    _json: '{"nest":{"source":"Macro","macro":0,"embed":null}}'
-    _objectReferences:
-    - {fileID: 11400000, guid: 167792fa91240014fb8100d8c0b8e71c, type: 2}
--- !u!114 &1204935885
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 749501648960564542}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e741851cba3ad425c91ecf922cc6b379, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  _data:
-    _json: '{"declarations":{"Kind":"Object","collection":{"$content":[{"name":"OnGround","value":{"$content":false,"$type":"System.Boolean"},"typeHandle":{"Identification":"System.Boolean,
-      mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089","$version":"A"},"$version":"A"}],"$version":"A"},"$version":"A"}}'
-    _objectReferences: []
 --- !u!1 &1941168049300974042 stripped
 GameObject:
  m_CorrespondingSourceObject: {fileID: 6085450026611476016, guid: 61dd8047e5e66dc4db5c150abe38beae, type: 3}
@ -256,38 +224,6 @@ MeshCollider:
  m_Convex: 1
  m_CookingOptions: 30
  m_Mesh: {fileID: -3183339516574119901, guid: 61dd8047e5e66dc4db5c150abe38beae, type: 3}
--- !u!114 &1243286690
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2398297990381228278}
-  m_Enabled: 0
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d2fe5546f775c47d2820aa5e8a715f53, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  _data:
-    _json: '{"nest":{"source":"Macro","macro":0,"embed":null}}'
-    _objectReferences:
-    - {fileID: 11400000, guid: 167792fa91240014fb8100d8c0b8e71c, type: 2}
--- !u!114 &1243286695
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2398297990381228278}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e741851cba3ad425c91ecf922cc6b379, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  _data:
-    _json: '{"declarations":{"Kind":"Object","collection":{"$content":[{"name":"OnGround","value":{"$content":false,"$type":"System.Boolean"},"typeHandle":{"Identification":"System.Boolean,
-      mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089","$version":"A"},"$version":"A"}],"$version":"A"},"$version":"A"}}'
-    _objectReferences: []
 --- !u!1 &2813751424733417823 stripped
 GameObject:
  m_CorrespondingSourceObject: {fileID: -1616859871024398667, guid: 61dd8047e5e66dc4db5c150abe38beae, type: 3}
@ -325,38 +261,6 @@ MeshCollider:
  m_Convex: 1
  m_CookingOptions: 30
  m_Mesh: {fileID: -3183339516574119901, guid: 61dd8047e5e66dc4db5c150abe38beae, type: 3}
--- !u!114 &1224994882
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3387733359169555233}
-  m_Enabled: 0
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d2fe5546f775c47d2820aa5e8a715f53, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  _data:
-    _json: '{"nest":{"source":"Macro","macro":0,"embed":null}}'
-    _objectReferences:
-    - {fileID: 11400000, guid: 167792fa91240014fb8100d8c0b8e71c, type: 2}
--- !u!114 &1224994887
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3387733359169555233}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e741851cba3ad425c91ecf922cc6b379, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  _data:
-    _json: '{"declarations":{"Kind":"Object","collection":{"$content":[{"name":"OnGround","value":{"$content":false,"$type":"System.Boolean"},"typeHandle":{"Identification":"System.Boolean,
-      mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089","$version":"A"},"$version":"A"}],"$version":"A"},"$version":"A"}}'
-    _objectReferences: []
 --- !u!1 &4774624094512517819 stripped
 GameObject:
  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 61dd8047e5e66dc4db5c150abe38beae, type: 3}
@ -422,38 +326,6 @@ MeshCollider:
  m_Convex: 1
  m_CookingOptions: 30
  m_Mesh: {fileID: -3183339516574119901, guid: 61dd8047e5e66dc4db5c150abe38beae, type: 3}
--- !u!114 &2133825191
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7629644934281361513}
-  m_Enabled: 0
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d2fe5546f775c47d2820aa5e8a715f53, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  _data:
-    _json: '{"nest":{"source":"Macro","macro":0,"embed":null}}'
-    _objectReferences:
-    - {fileID: 11400000, guid: 167792fa91240014fb8100d8c0b8e71c, type: 2}
--- !u!114 &2133825192
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7629644934281361513}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e741851cba3ad425c91ecf922cc6b379, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  _data:
-    _json: '{"declarations":{"Kind":"Object","collection":{"$content":[{"name":"OnGround","value":{"$content":false,"$type":"System.Boolean"},"typeHandle":{"Identification":"System.Boolean,
-      mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089","$version":"A"},"$version":"A"}],"$version":"A"},"$version":"A"}}'
-    _objectReferences: []
 --- !u!1 &7802258548554580668 stripped
 GameObject:
  m_CorrespondingSourceObject: {fileID: -6718097069914690218, guid: 61dd8047e5e66dc4db5c150abe38beae, type: 3}
@ -473,35 +345,3 @@ MeshCollider:
  m_Convex: 1
  m_CookingOptions: 30
  m_Mesh: {fileID: -3183339516574119901, guid: 61dd8047e5e66dc4db5c150abe38beae, type: 3}
--- !u!114 &969457602
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7802258548554580668}
-  m_Enabled: 0
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d2fe5546f775c47d2820aa5e8a715f53, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  _data:
-    _json: '{"nest":{"source":"Macro","macro":0,"embed":null}}'
-    _objectReferences:
-    - {fileID: 11400000, guid: 167792fa91240014fb8100d8c0b8e71c, type: 2}
--- !u!114 &969457603
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7802258548554580668}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e741851cba3ad425c91ecf922cc6b379, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  _data:
-    _json: '{"declarations":{"Kind":"Object","collection":{"$content":[{"name":"OnGround","value":{"$content":false,"$type":"System.Boolean"},"typeHandle":{"Identification":"System.Boolean,
-      mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089","$version":"A"},"$version":"A"}],"$version":"A"},"$version":"A"}}'
-    _objectReferences: []
--- a/Assets/Models/hammer
+++ b/Assets/Models/hammer
@ -369,7 +369,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 4692477033812591368}
  m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071067}
-  m_LocalPosition: {x: 0, y: 0, z: 0.06175232}
+  m_LocalPosition: {x: 0, y: 2.48, z: 0.06175232}
  m_LocalScale: {x: 1.4781778, y: 1.4781778, z: 1.4781778}
  m_ConstrainProportionsScale: 0
  m_Children: []
--- a/Assets/Models/pliers.prefab
+++ b/Assets/Models/pliers.prefab
@ -13,15 +13,15 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: -8679921383154817045, guid: d8f1959686ece1243846f554fdcd7273, type: 3}
      propertyPath: m_LocalScale.x
-      value: 0.10131945
+      value: 0.2
      objectReference: {fileID: 0}
    - target: {fileID: -8679921383154817045, guid: d8f1959686ece1243846f554fdcd7273, type: 3}
      propertyPath: m_LocalScale.y
-      value: 0.10131945
+      value: 0.2
      objectReference: {fileID: 0}
    - target: {fileID: -8679921383154817045, guid: d8f1959686ece1243846f554fdcd7273, type: 3}
      propertyPath: m_LocalScale.z
-      value: 0.10131945
+      value: 0.2
      objectReference: {fileID: 0}
    - target: {fileID: -8679921383154817045, guid: d8f1959686ece1243846f554fdcd7273, type: 3}
      propertyPath: m_LocalPosition.x
@ -63,50 +63,16 @@ PrefabInstance:
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: d8f1959686ece1243846f554fdcd7273, type: 3}
+      propertyPath: m_ConstrainProportionsScale
+      value: 1
+      objectReference: {fileID: 0}
    - target: {fileID: 919132149155446097, guid: d8f1959686ece1243846f554fdcd7273, type: 3}
      propertyPath: m_Name
      value: pliers
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: d8f1959686ece1243846f554fdcd7273, type: 3}
--- !u!1 &301319348876434176 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: -7640558969779515294, guid: d8f1959686ece1243846f554fdcd7273, type: 3}
-  m_PrefabInstance: {fileID: 1286279349039090530}
-  m_PrefabAsset: {fileID: 0}
--- !u!136 &7688451815724401248
-CapsuleCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 301319348876434176}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  m_Radius: 0.9883504
-  m_Height: 11.624478
-  m_Direction: 2
-  m_Center: {x: 0.0035420142, y: 0.5332932, z: 3.5446324}
--- !u!1 &940052642335090451 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: -7146521406498821007, guid: d8f1959686ece1243846f554fdcd7273, type: 3}
-  m_PrefabInstance: {fileID: 1286279349039090530}
-  m_PrefabAsset: {fileID: 0}
--- !u!136 &2602164159852921622
-CapsuleCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 940052642335090451}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  m_Radius: 1.1447892
-  m_Height: 11.7702055
-  m_Direction: 1
-  m_Center: {x: -0.010061374, y: 3.5248175, z: -0.6070304}
 --- !u!1 &1897611713971714310 stripped
 GameObject:
  m_CorrespondingSourceObject: {fileID: -8391222552659086748, guid: d8f1959686ece1243846f554fdcd7273, type: 3}
@ -122,10 +88,10 @@ CapsuleCollider:
  m_Material: {fileID: 0}
  m_IsTrigger: 0
  m_Enabled: 1
-  m_Radius: 1.7870617
-  m_Height: 18.439774
-  m_Direction: 1
-  m_Center: {x: 2.387984, y: -3.5306828, z: -0.07516412}
+  m_Radius: 2.4462943
+  m_Height: 18.52887
+  m_Direction: 2
+  m_Center: {x: -2.3329592, y: -8.697551e-15, z: -3.736883}
 --- !u!1 &2096603271310898739 stripped
 GameObject:
  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: d8f1959686ece1243846f554fdcd7273, type: 3}
@ -239,6 +205,33 @@ MonoBehaviour:
  highlightOnHover: 1
  hideHighlight: []
  hoverPriority: 0
+--- !u!114 &3960184586102675806
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2096603271310898739}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e7418c7dd8f977d4e969202d3fa7e926, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  poseEditorExpanded: 1
+  blendEditorExpanded: 1
+  poseNames:
+  - Pliers (MAIN)
+  overridePreviewLeftHandPrefab: {fileID: 1000013348574242, guid: 638779290bce1af49b356f33dcc6fccf, type: 3}
+  overridePreviewRightHandPrefab: {fileID: 1000010304998954, guid: 6def53d002137b747aec0b29551e0e25, type: 3}
+  skeletonMainPose: {fileID: 11400000, guid: 6ab30d9290ee9ef429794473765f9019, type: 2}
+  skeletonAdditionalPoses: []
+  showLeftPreview: 0
+  showRightPreview: 0
+  previewLeftInstance: {fileID: 0}
+  previewRightInstance: {fileID: 0}
+  previewPoseSelection: 0
+  blendingBehaviours: []
+  scale: 1
 --- !u!114 &4983244824993224224
 MonoBehaviour:
  m_ObjectHideFlags: 0
@ -293,33 +286,6 @@ MonoBehaviour:
    m_PersistentCalls:
      m_Calls: []
  interactable: {fileID: 0}
--- !u!114 &5066673686994042309
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2096603271310898739}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e7418c7dd8f977d4e969202d3fa7e926, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  poseEditorExpanded: 1
-  blendEditorExpanded: 1
-  poseNames:
-  - Pliers (MAIN)
-  overridePreviewLeftHandPrefab: {fileID: 1000013348574242, guid: 638779290bce1af49b356f33dcc6fccf, type: 3}
-  overridePreviewRightHandPrefab: {fileID: 1000010304998954, guid: 6def53d002137b747aec0b29551e0e25, type: 3}
-  skeletonMainPose: {fileID: 11400000, guid: 6ab30d9290ee9ef429794473765f9019, type: 2}
-  skeletonAdditionalPoses: []
-  showLeftPreview: 0
-  showRightPreview: 0
-  previewLeftInstance: {fileID: 0}
-  previewRightInstance: {fileID: 0}
-  previewPoseSelection: 0
-  blendingBehaviours: []
-  scale: 1
 --- !u!114 &9084598848516749552
 MonoBehaviour:
  m_ObjectHideFlags: 0
@ -335,22 +301,3 @@ MonoBehaviour:
  velocityAverageFrames: 5
  angularVelocityAverageFrames: 11
  estimateOnAwake: 0
--- !u!1 &7570475958632844146 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: -516098083770646512, guid: d8f1959686ece1243846f554fdcd7273, type: 3}
-  m_PrefabInstance: {fileID: 1286279349039090530}
-  m_PrefabAsset: {fileID: 0}
--- !u!136 &63192343701829226
-CapsuleCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7570475958632844146}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  m_Radius: 1.7870617
-  m_Height: 18.439774
-  m_Direction: 1
-  m_Center: {x: -2.387984, y: -3.5306828, z: -0.07516412}
--- a/Assets/Poses/Pliers.asset
+++ b/Assets/Poses/Pliers.asset
@ -21,8 +21,8 @@ MonoBehaviour:
    pinkyFingerMovementType: 0
    ignoreRootPoseData: 1
    ignoreWristPoseData: 1
-    position: {x: 0, y: 0, z: 0}
-    rotation: {x: 0, y: 0, z: 0, w: 0}
+    position: {x: 0.000000059604645, y: 0, z: 0}
+    rotation: {x: 0, y: -0, z: -0, w: -1}
    bonePositions: []
    boneRotations: []
  rightHand:
@ -35,7 +35,7 @@ MonoBehaviour:
    ignoreRootPoseData: 1
    ignoreWristPoseData: 1
    position: {x: 0, y: 0, z: 0}
-    rotation: {x: 0, y: 0, z: 0, w: 0}
+    rotation: {x: -0, y: -0, z: -0, w: 1}
    bonePositions: []
    boneRotations: []
  applyToSkeletonRoot: 1
--- a/Assets/Scenes/FabLab/FabLab.unity
+++ b/Assets/Scenes/FabLab/FabLab.unity
--- a/Assets/Scenes/FabLab/FabLab/ReflectionProbe-0.png
+++ b/Assets/Scenes/FabLab/FabLab/ReflectionProbe-0.png
--- a/Assets/Scenes/FabLab/FabLab/ReflectionProbe-0.png.meta
+++ b/Assets/Scenes/FabLab/FabLab/ReflectionProbe-0.png.meta
@ -113,6 +113,18 @@ TextureImporter:
    overridden: 0
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    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: []
--- a/Assets/Scripts/MovableFurniture.cs
+++ b/Assets/Scripts/MovableFurniture.cs
@ -1,10 +1,5 @@
-using Oculus.Interaction.PoseDetection;
-using System.Collections;
 using System.Collections.Generic;
-using System.Linq;
-using Unity.VisualScripting;
 using UnityEngine;
-using UnityEngine.UI;

 public class MovableFurniture : MonoBehaviour
 {
@ -37,7 +32,7 @@ public class MovableFurniture : MonoBehaviour
    // Update is called once per frame
    void Update()
    {
-        
+
    }

    public void OnPointerClickUp()
@ -50,9 +45,9 @@ public class MovableFurniture : MonoBehaviour
    }
    public void OnPointerClickDown()
    {
-        if(_rigidbody!= null)
+        if (_rigidbody != null)
        {
-            _rigidbody.useGravity= false;
+            _rigidbody.useGravity = false;
        }

    }
@ -79,11 +74,11 @@ public class MovableFurniture : MonoBehaviour
    public void SnapTo(Vector3 position, LayerMask layerMask)
    {
        Vector3 displacement = Vector3.zero;
-        this.transform.position = position+centerOffset;
+        this.transform.position = position + centerOffset;
        Vector3[] directions = { Vector3.right, Vector3.left, Vector3.up, Vector3.down, Vector3.forward, Vector3.back };
-        int[] extents = { 0,0,1,1,2,2 };
-        
-        for (int i = 0; i<6; i++ )
+        int[] extents = { 0, 0, 1, 1, 2, 2 };
+
+        for (int i = 0; i < 6; i++)
        {
            Ray raycast = new Ray(transform.position - centerOffset - (directions[i] * combinedBounds.extents[extents[i]]), (directions[i] * combinedBounds.size[extents[i]]));
            RaycastHit hit;
@ -113,7 +108,7 @@ public class MovableFurniture : MonoBehaviour
        // Draw a yellow sphere at the transform's position
        Gizmos.color = Color.red;
        Gizmos.DrawWireCube(transform.position - centerOffset, combinedBounds.size);
-        Gizmos.DrawRay((transform.position - centerOffset) - (new Vector3(0,0,combinedBounds.extents.z)), (new Vector3(0, 0, combinedBounds.size.z)));
+        Gizmos.DrawRay((transform.position - centerOffset) - (new Vector3(0, 0, combinedBounds.extents.z)), (new Vector3(0, 0, combinedBounds.size.z)));
    }

    private void CalculateBounds()
@ -142,7 +137,6 @@ public class MovableFurniture : MonoBehaviour
            }
        }
        //combinedBounds = renderers[0].bounds;
-        Debug.Log(combinedBounds.center);
        centerOffset = transform.position - combinedBounds.center;
    }
 }
--- a/Assets/Texture/CircuitBoard_Metallic.png
+++ b/Assets/Texture/CircuitBoard_Metallic.png
--- a/Assets/Texture/CircuitBoard_Metallic.png.meta
+++ b/Assets/Texture/CircuitBoard_Metallic.png.meta
@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: 5b29c9a0366077d4189769da5151bef2
+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
+  - serializedVersion: 3
+    buildTarget: Android
+    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: WebGL
+    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: 
--- a/Assets/Texture/CircuitBoard_Metallic_2.png
+++ b/Assets/Texture/CircuitBoard_Metallic_2.png
--- a/Assets/Texture/CircuitBoard_Metallic_2.png.meta
+++ b/Assets/Texture/CircuitBoard_Metallic_2.png.meta
@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: 33ef2905e65468c4a8bdbf7613c47218
+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
+  - serializedVersion: 3
+    buildTarget: Android
+    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: WebGL
+    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: 
--- a/Assets/Texture/CircuitBoard_diffuse.png
+++ b/Assets/Texture/CircuitBoard_diffuse.png
--- a/Assets/Texture/CircuitBoard_diffuse.png.meta
+++ b/Assets/Texture/CircuitBoard_diffuse.png.meta
@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: 0aff3df6854d11b4599b809d07bd3ed2
+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
+  - serializedVersion: 3
+    buildTarget: Android
+    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: WebGL
+    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: 
--- a/Packages/manifest.json
+++ b/Packages/manifest.json
@ -7,6 +7,7 @@
    "com.unity.ide.visualstudio": "2.0.17",
    "com.unity.ide.vscode": "1.2.5",
    "com.unity.probuilder": "5.0.6",
+    "com.unity.project-auditor": "https://github.com/Unity-Technologies/ProjectAuditor.git",
    "com.unity.test-framework": "1.1.33",
    "com.unity.textmeshpro": "3.0.6",
    "com.unity.timeline": "1.6.4",
@ -15,7 +16,6 @@
    "com.unity.ugui": "1.0.0",
    "com.unity.visualscripting": "1.7.8",
    "com.unity.xr.management": "4.3.1",
-    "com.unity.xr.mock-hmd": "1.3.0-preview.1",
    "com.unity.xr.oculus": "3.2.2",
    "com.unity.xr.openxr": "1.5.3",
    "com.valvesoftware.unity.openvr": "file:../Assets/SteamVR/OpenVRUnityXRPackage/Editor/com.valvesoftware.unity.openvr-1.1.4.tgz",
--- a/Packages/packages-lock.json
+++ b/Packages/packages-lock.json
@ -78,6 +78,13 @@
      },
      "url": "https://packages.unity.com"
    },
+    "com.unity.nuget.mono-cecil": {
+      "version": "1.10.2",
+      "depth": 1,
+      "source": "registry",
+      "dependencies": {},
+      "url": "https://packages.unity.com"
+    },
    "com.unity.nuget.newtonsoft-json": {
      "version": "3.0.2",
      "depth": 2,
@ -103,6 +110,15 @@
      },
      "url": "https://packages.unity.com"
    },
+    "com.unity.project-auditor": {
+      "version": "https://github.com/Unity-Technologies/ProjectAuditor.git",
+      "depth": 0,
+      "source": "git",
+      "dependencies": {
+        "com.unity.nuget.mono-cecil": "1.10.2"
+      },
+      "hash": "70023efe8ae2b28076b3f52719b4fd082732edd2"
+    },
    "com.unity.services.core": {
      "version": "1.6.0",
      "depth": 1,
@ -240,15 +256,6 @@
      },
      "url": "https://packages.unity.com"
    },
-    "com.unity.xr.mock-hmd": {
-      "version": "1.3.0-preview.1",
-      "depth": 0,
-      "source": "registry",
-      "dependencies": {
-        "com.unity.xr.management": "4.0.1"
-      },
-      "url": "https://packages.unity.com"
-    },
    "com.unity.xr.oculus": {
      "version": "3.2.2",
      "depth": 0,
--- a/ProjectSettings/Packages/com.unity.probuilder/Settings.json
+++ b/ProjectSettings/Packages/com.unity.probuilder/Settings.json
@ -28,6 +28,16 @@
                "key": "lightmapping.autoUnwrapLightmapUV",
                "value": "{\"m_Value\":true}"
            },
+            {
+                "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
+                "key": "editor.autoRecalculateCollisions",
+                "value": "{\"m_Value\":false}"
+            },
+            {
+                "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
+                "key": "ShapeComponent.ResetSettings",
+                "value": "{\"m_Value\":false}"
+            },
            {
                "type": "UnityEngine.ProBuilder.LogLevel, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
                "key": "log.level",
--- a/ProjectSettings/QualitySettings.asset
+++ b/ProjectSettings/QualitySettings.asset
@ -223,7 +223,7 @@ QualitySettings:
    customRenderPipeline: {fileID: 0}
    excludedTargetPlatforms: []
  m_PerPlatformDefaultQuality:
-    Android: 2
+    Android: 1
    GameCoreScarlett: 5
    GameCoreXboxOne: 5
    Lumin: 5