Affichage des molécules unitairement et en mode fusion

2024-01-11 11:26:53 +01:00 · 2024-01-11 11:26:53 +01:00 · afa265dd31
commit afa265dd31
parent 84136dcc5c
18 changed files with 777 additions and 18 deletions
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@ -49,5 +49,39 @@ jobs:
      # Output
      - uses: actions/upload-artifact@v3
        with:
-          name: Build
-          path: build
+          name: build-Android
+          path: build
+  releaseToGooglePlay:
+    name: Release to the Google Play Store
+    runs-on: ubuntu-latest
+    needs: build
+    env:
+      GOOGLE_PLAY_KEY_FILE: ${{ secrets.GOOGLE_PLAY_KEY_FILE }}
+      GOOGLE_PLAY_KEY_FILE_PATH:
+        ${{ format('{0}/fastlane/google-fastlane.json', github.workspace) }}
+      ANDROID_BUILD_FILE_PATH: ${{ format('{0}/build/Android/Android.aab', github.workspace) }}
+      ANDROID_PACKAGE_NAME: ${{ secrets.ANDROID_PACKAGE_NAME }}
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+      - name: Download Android Artifact
+        uses: actions/download-artifact@v3
+        with:
+          name: build-Android
+          path: build
+      - name: Add Authentication
+        run: echo "$GOOGLE_PLAY_KEY_FILE" > $GOOGLE_PLAY_KEY_FILE_PATH
+      - name: Set up Fastlane
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.2
+          bundler-cache: true
+      - name: Upload to Google Play Internal
+        uses: maierj/fastlane-action@v3.0.0
+        with:
+          lane: 'android internal' # Change to upload to a different lane
+      - name: Cleanup to avoid storage limit
+        if: always()
+        uses: geekyeggo/delete-artifact@v2
+        with:
+          name: build-Android
--- a/Assets/ActiveScoppedElements.cs
+++ b/Assets/ActiveScoppedElements.cs
@ -12,13 +12,15 @@ public class ActiveScoppedElements : MonoBehaviour
        public List<String> elements;
        public GameObject obj;
    }
-    
+
+
    // Start is called before the first frame update
    public HashSet<String> actives = new HashSet<String>();
    public HashSet<GameObject> InstantiatesObject = new HashSet<GameObject>();
    public TextMeshProUGUI textToUpdate;
    public TextMeshProUGUI objectInstantiateText;
    public ObjectToInstantiate[] objectToInstantiates;
+    public HashSet<GameObject> DisableGameObjects = new HashSet<GameObject>();

    void Start()
    {
@ -35,7 +37,7 @@ public class ActiveScoppedElements : MonoBehaviour
        {
            actives.Add(name);
            RefreshText();
-            RefreshAtom(); 
+            RefreshAtom();
        }
    }

@ -53,6 +55,15 @@ public class ActiveScoppedElements : MonoBehaviour
        {
            if (objt.elements.TrueForAll((s => actives.Contains(s))))
            {
+                foreach (var objName in objt.elements)
+                {
+                    var a = GameObject.Find("OBJ_" + objName);
+                    if (a != null)
+                    {
+                        a.SetActive(false);
+                        DisableGameObjects.Add(a);
+                    }
+                }
                // Obtenez la position de la caméra
                Vector3 cameraPosition = Camera.main.transform.position;

@ -60,7 +71,7 @@ public class ActiveScoppedElements : MonoBehaviour
                Quaternion cameraRotation = Quaternion.Euler(0, Camera.main.transform.rotation.eulerAngles.y, 0);

                // Calculez la position finale en ajoutant la direction vers l'avant multipliée par la distance désirée
-                Vector3 position = cameraPosition + cameraRotation * Vector3.forward * 0.5f;
+                Vector3 position = cameraPosition + cameraRotation * Vector3.forward * 0.35f;

                var instantiatedObj = Instantiate(objt.obj, position, cameraRotation);
                instantiatedObj.name = "[N] " + objt.obj.name;
@ -75,6 +86,11 @@ public class ActiveScoppedElements : MonoBehaviour
                    Debug.Log("Destroy " + a.name);
                    InstantiatesObject.Remove(a);
                    Destroy(a);
+                    foreach (var disableGameObject in DisableGameObjects)
+                    {
+                        disableGameObject.SetActive(true);
+                    }
+                    DisableGameObjects.Clear();
                }
            }
        }
@ -92,7 +108,7 @@ public class ActiveScoppedElements : MonoBehaviour
    public void RemoveUnscoppedElement(String name)
    {
        Debug.Log("Removed " + name);
-        actives.Clear();
+        actives.Remove(name);
        RefreshText();
        RefreshAtom();
        ////if (actives.Contains(name))
--- a/Assets/Hydrogene.prefab
+++ b/Assets/Hydrogene.prefab
@ -0,0 +1,139 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &2296197579250447769
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4757697444972247267}
+  m_Layer: 0
+  m_Name: Hydrogene
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4757697444972247267
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2296197579250447769}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.05, y: 0.05, z: 0.05}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 3968389891867124083}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &8240868010827823369
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3968389891867124083}
+  - component: {fileID: 6032363679560578112}
+  - component: {fileID: 7453579962749136088}
+  - component: {fileID: 3020005706646133113}
+  m_Layer: 0
+  m_Name: Cube
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3968389891867124083
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8240868010827823369}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4757697444972247267}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &6032363679560578112
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8240868010827823369}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &7453579962749136088
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8240868010827823369}
+  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: 8e51262e266d76b48aa357c1f99b814e, 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 &3020005706646133113
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8240868010827823369}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 0
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
--- a/Assets/Hydrogene.prefab.meta
+++ b/Assets/Hydrogene.prefab.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: ae2d2b687aff85b46a01c62e312954d2
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/ObjReferentials.cs
+++ b/Assets/ObjReferentials.cs
@ -0,0 +1,60 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Unity.VisualScripting;
+using UnityEngine;
+
+public class ObjReferentials : MonoBehaviour
+{
+    [Serializable]
+    public struct ObjToRender
+    {
+        public String name;
+        public GameObject objToRender;
+    }
+
+    public ObjToRender[] ObjToRenders;
+    public HashSet<ObjToRender> InstantiatesElements = new HashSet<ObjToRender>();
+
+
+    public void EnableElementRender(String elementName)
+    {
+        foreach (var objToRender in ObjToRenders)
+        {
+            if (objToRender.name == elementName)
+            {
+                if (InstantiatesElements.Any(render => render.name == elementName))
+                {
+                    // element are already instantiate !
+                }
+                else
+                {
+                    Vector3 cameraPosition = Camera.main.transform.position;
+
+                    // Obtenez la rotation de la caméra sans inclure la rotation autour de l'axe Y
+                    Quaternion cameraRotation = Quaternion.Euler(0, Camera.main.transform.rotation.eulerAngles.y, 0);
+
+                    // Calculez la position finale en ajoutant la direction vers l'avant multipliée par la distance désirée
+                    Vector3 position = cameraPosition + cameraRotation * Vector3.forward * 0.2f;
+
+                    var instantiatedObj = Instantiate(objToRender.objToRender, position, cameraRotation);
+                    instantiatedObj.name = objToRender.name;
+                    InstantiatesElements.Add(new ObjToRender() {name = objToRender.name, objToRender = instantiatedObj});
+                }
+            }
+        }
+    }
+
+    public void DisableElementRender(String elementName)
+    {
+        foreach (var objToRender in InstantiatesElements)
+        {
+            if (objToRender.name == elementName)
+            {
+                InstantiatesElements.Remove(objToRender);
+                Destroy(objToRender.objToRender);
+                return;
+            }
+        }
+    }
+}
--- a/Assets/ObjReferentials.cs.meta
+++ b/Assets/ObjReferentials.cs.meta
@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 6af1048428934d509da61ba83a6053c6
+timeCreated: 1704964054
--- a/Assets/Oxygene.prefab
+++ b/Assets/Oxygene.prefab
@ -0,0 +1,139 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &2296197579250447769
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4757697444972247267}
+  m_Layer: 0
+  m_Name: Oxygene
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4757697444972247267
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2296197579250447769}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.05, y: 0.05, z: 0.05}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 3968389891867124083}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &8240868010827823369
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3968389891867124083}
+  - component: {fileID: 6032363679560578112}
+  - component: {fileID: 7453579962749136088}
+  - component: {fileID: 3020005706646133113}
+  m_Layer: 0
+  m_Name: Cube
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3968389891867124083
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8240868010827823369}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4757697444972247267}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &6032363679560578112
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8240868010827823369}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &7453579962749136088
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8240868010827823369}
+  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: 2eaaa81492e776f469410f5cf36631d2, 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 &3020005706646133113
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8240868010827823369}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 0
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
--- a/Assets/Oxygene.prefab.meta
+++ b/Assets/Oxygene.prefab.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 7c22f7e0b871cb14fa1ad0765c00dfeb
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Resources/New
+++ b/Assets/Resources/New
@ -0,0 +1,83 @@
+%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: New Material 1
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  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: 0}
+        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: 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}
+    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: 0, g: 1, b: 0.18335032, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []
--- a/Assets/Resources/New
+++ b/Assets/Resources/New
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2eaaa81492e776f469410f5cf36631d2
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Resources/New
+++ b/Assets/Resources/New
@ -0,0 +1,83 @@
+%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: New Material
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  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: 0}
+        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: 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}
+    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: 0, b: 0, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []
--- a/Assets/Resources/New
+++ b/Assets/Resources/New
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8e51262e266d76b48aa357c1f99b814e
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Resources/VuforiaConfiguration.asset
+++ b/Assets/Resources/VuforiaConfiguration.asset
@ -18,13 +18,13 @@ MonoBehaviour:
    delayedInitialization: 0
    cameraFocusModeSetting: 2
    cameraDeviceModeSetting: -1
-    maxSimultaneousImageTargets: 1
+    maxSimultaneousImageTargets: 4
    virtualSceneScaleFactor: 1
    modelTargetRecoWhileExtendedTracked: 1
    shareRecordingsInITunes: 0
    logLevel: 0
    version: 10.18.4
-    eulaAcceptedVersions: '{"Values":["10.17","10.18","0.0"]}'
+    eulaAcceptedVersions: '{"Values":["10.17","10.18","0.0","10.15"]}'
  database:
    disableModelExtraction: 0
  shaders:
--- a/Assets/Scenes/Fusion.unity
+++ b/Assets/Scenes/Fusion.unity
@ -234,7 +234,7 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 1903, y: 113}
+  m_AnchoredPosition: {x: 909, y: 113}
  m_SizeDelta: {x: 300, y: 100}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &436501312
@ -636,6 +636,85 @@ RectTransform:
  m_AnchoredPosition: {x: 0, y: 0}
  m_SizeDelta: {x: 0, y: 0}
  m_Pivot: {x: 0, y: 0}
+--- !u!1001 &1193470963
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 2082618016}
+    m_Modifications:
+    - target: {fileID: 2296197579250447769, guid: 7c22f7e0b871cb14fa1ad0765c00dfeb,
+        type: 3}
+      propertyPath: m_Name
+      value: OBJ_Oxygene
+      objectReference: {fileID: 0}
+    - target: {fileID: 2296197579250447769, guid: 7c22f7e0b871cb14fa1ad0765c00dfeb,
+        type: 3}
+      propertyPath: m_TagString
+      value: OBJ
+      objectReference: {fileID: 0}
+    - target: {fileID: 4757697444972247267, guid: 7c22f7e0b871cb14fa1ad0765c00dfeb,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4757697444972247267, guid: 7c22f7e0b871cb14fa1ad0765c00dfeb,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.239
+      objectReference: {fileID: 0}
+    - target: {fileID: 4757697444972247267, guid: 7c22f7e0b871cb14fa1ad0765c00dfeb,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4757697444972247267, guid: 7c22f7e0b871cb14fa1ad0765c00dfeb,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4757697444972247267, guid: 7c22f7e0b871cb14fa1ad0765c00dfeb,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4757697444972247267, guid: 7c22f7e0b871cb14fa1ad0765c00dfeb,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4757697444972247267, guid: 7c22f7e0b871cb14fa1ad0765c00dfeb,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4757697444972247267, guid: 7c22f7e0b871cb14fa1ad0765c00dfeb,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4757697444972247267, guid: 7c22f7e0b871cb14fa1ad0765c00dfeb,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4757697444972247267, guid: 7c22f7e0b871cb14fa1ad0765c00dfeb,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 7c22f7e0b871cb14fa1ad0765c00dfeb, type: 3}
+--- !u!4 &1193470964 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 4757697444972247267, guid: 7c22f7e0b871cb14fa1ad0765c00dfeb,
+    type: 3}
+  m_PrefabInstance: {fileID: 1193470963}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1201501053
 GameObject:
  m_ObjectHideFlags: 0
@ -670,7 +749,7 @@ MonoBehaviour:
  objectInstantiateText: {fileID: 701088218}
  objectToInstantiates:
  - elements:
-    - Hydrogen
+    - Hydrogene
    - Oxygene
    obj: {fileID: 2296197579250447769, guid: 7a646e28c3628074eb3979c92e6b5433, type: 3}
 --- !u!114 &1201501055
@ -764,7 +843,8 @@ Transform:
  m_LocalPosition: {x: 1.134, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 1843136735}
  m_Father: {fileID: 2141458387}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1576193662
@ -798,7 +878,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 886328de6a5c14cbb85854fdf1a5085b, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  StatusFilter: 1
+  StatusFilter: 0
  UsePoseSmoothing: 0
  AnimationCurve:
    serializedVersion: 2
@ -1015,6 +1095,85 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1759769648}
  m_CullTransparentMesh: 1
+--- !u!1001 &1843136734
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 1576193661}
+    m_Modifications:
+    - target: {fileID: 2296197579250447769, guid: ae2d2b687aff85b46a01c62e312954d2,
+        type: 3}
+      propertyPath: m_Name
+      value: OBJ_Hydrogene
+      objectReference: {fileID: 0}
+    - target: {fileID: 2296197579250447769, guid: ae2d2b687aff85b46a01c62e312954d2,
+        type: 3}
+      propertyPath: m_TagString
+      value: OBJ
+      objectReference: {fileID: 0}
+    - target: {fileID: 4757697444972247267, guid: ae2d2b687aff85b46a01c62e312954d2,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4757697444972247267, guid: ae2d2b687aff85b46a01c62e312954d2,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.234
+      objectReference: {fileID: 0}
+    - target: {fileID: 4757697444972247267, guid: ae2d2b687aff85b46a01c62e312954d2,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4757697444972247267, guid: ae2d2b687aff85b46a01c62e312954d2,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4757697444972247267, guid: ae2d2b687aff85b46a01c62e312954d2,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4757697444972247267, guid: ae2d2b687aff85b46a01c62e312954d2,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4757697444972247267, guid: ae2d2b687aff85b46a01c62e312954d2,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4757697444972247267, guid: ae2d2b687aff85b46a01c62e312954d2,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4757697444972247267, guid: ae2d2b687aff85b46a01c62e312954d2,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4757697444972247267, guid: ae2d2b687aff85b46a01c62e312954d2,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: ae2d2b687aff85b46a01c62e312954d2, type: 3}
+--- !u!4 &1843136735 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 4757697444972247267, guid: ae2d2b687aff85b46a01c62e312954d2,
+    type: 3}
+  m_PrefabInstance: {fileID: 1843136734}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &2082618015
 GameObject:
  m_ObjectHideFlags: 0
@ -1046,7 +1205,8 @@ Transform:
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 1193470964}
  m_Father: {fileID: 2141458387}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &2082618017
@ -1080,7 +1240,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 886328de6a5c14cbb85854fdf1a5085b, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  StatusFilter: 1
+  StatusFilter: 0
  UsePoseSmoothing: 0
  AnimationCurve:
    serializedVersion: 2
@ -1230,7 +1390,7 @@ Camera:
  m_BackGroundColor: {r: 0, g: 0, b: 0, a: 1}
  m_projectionMatrixMode: 1
  m_GateFitMode: 2
-  m_FOVAxisMode: 0
+  m_FOVAxisMode: 1
  m_Iso: 200
  m_ShutterSpeed: 0.005
  m_Aperture: 16
@ -1250,7 +1410,7 @@ Camera:
    height: 1
  near clip plane: 0.05
  far clip plane: 2000
-  field of view: 60
+  field of view: 26.991467
  orthographic: 0
  orthographic size: 5
  m_Depth: 1
--- a/Packages/manifest.json
+++ b/Packages/manifest.json
@ -1,10 +1,11 @@
 {
-    "dependencies": {
+  "dependencies": {
    "com.ptc.vuforia.engine": "file:com.ptc.vuforia.engine-10.18.4.tgz",
    "com.unity.collab-proxy": "2.1.0",
    "com.unity.feature.ar": "1.0.1",
    "com.unity.feature.development": "1.0.1",
    "com.unity.learn.iet-framework": "3.1.3",
+    "com.unity.mobile.android-logcat": "1.3.2",
    "com.unity.textmeshpro": "3.0.6",
    "com.unity.timeline": "1.7.5",
    "com.unity.visualscripting": "1.9.1",
@ -41,4 +42,4 @@
    "com.unity.modules.wind": "1.0.0",
    "com.unity.modules.xr": "1.0.0"
  }
-}
+}
--- a/Packages/packages-lock.json
+++ b/Packages/packages-lock.json
@ -106,6 +106,13 @@
      "dependencies": {},
      "url": "https://packages.unity.com"
    },
+    "com.unity.mobile.android-logcat": {
+      "version": "1.3.2",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {},
+      "url": "https://packages.unity.com"
+    },
    "com.unity.performance.profile-analyzer": {
      "version": "1.2.2",
      "depth": 1,
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
@ -8,6 +8,9 @@ EditorBuildSettings:
  - enabled: 1
    path: Assets/Scenes/MainMenu.unity
    guid: 432255403d6f571478f1043c2afa99d5
+  - enabled: 1
+    path: Assets/Scenes/Fusion.unity
+    guid: 2a5939d7d79bc264eb4560107f96904a
  m_configObjects:
    Unity.XR.WindowsMR.Settings: {fileID: 11400000, guid: 744b813df90924c169af73489b8325de,
      type: 2}
--- a/ProjectSettings/TagManager.asset
+++ b/ProjectSettings/TagManager.asset
@ -5,6 +5,7 @@ TagManager:
  serializedVersion: 2
  tags:
  - version_text
+  - OBJ
  layers:
  - Default
  - TransparentFX