rajout de la gestion d'animation + des factory

Merge remote-tracking branch 'origin/develop' into feature/molecule
# Conflicts: # Assets/script/MoleculeFactory.cs
2024-01-18 16:28:39 +01:00 · 2024-01-18 13:53:20 +01:00 · 2024-01-18 14:47:23 +01:00 · 2024-01-18 13:46:44 +01:00 · 2024-01-18 14:24:40 +01:00 · 2024-01-18 14:00:09 +01:00
38 changed files with 5949 additions and 152 deletions
--- a/Assets/ActiveScoppedElements.cs
+++ b/Assets/ActiveScoppedElements.cs
@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using TMPro;
 using UnityEngine;
+using UnityEngine.UI;

 public class ActiveScoppedElements : MonoBehaviour
 {
@ -13,20 +14,37 @@ public class ActiveScoppedElements : MonoBehaviour
        public GameObject obj;
    }

+    public enum AnimationState
+    {
+        IDLE,
+        GORIGHT,
+        GOLEFT
+    }
+

-    // Start is called before the first frame update
    public TextAsset jsonFile;
+    public TextAsset atomJsonFile;
    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>();
    public GameObject[] InformationObjs;
    public GameObject[] DebugObjs;
+    private AnimationState _animationState = AnimationState.IDLE;
+    private float _animationSpeed = 1.0f;
+
+    private AtomeFactory _atomFactory;
+        

    void Start()
    {
+        _atomFactory = new AtomeFactory(this.atomJsonFile);
+        Debug.Log("AtomFactory created !");
+        /*if (button != null)
+        {
+            button.onClick.AddListener(this.Center);
+        }*/
        if (this.textToUpdate != null)
        {
            textToUpdate.text = "Scanner des Markers...";
@ -44,6 +62,85 @@ public class ActiveScoppedElements : MonoBehaviour
        }
    }

+    public void Center()
+    {
+        Debug.Log("Center called !");
+        foreach (var obj in InstantiatesObject)
+        {
+            if (Camera.main == null)
+            {
+                throw new Exception("NO MAIN CAMERA DEFINED ");
+            }
+            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.35f;
+
+            //var instantiatedObj = Instantiate(objt.obj, position, cameraRotation);
+            
+            obj.transform.position = position;
+            obj.transform.localScale = new Vector3(0.05f, 0.05f, 0.05f);
+            obj.transform.rotation = cameraRotation;
+        }
+    }
+
+    public void onClickStopAnimation()
+    {
+        Quaternion cameraRotation = Quaternion.Euler(0, Camera.main.transform.rotation.eulerAngles.y, 0);
+        this._animationState = AnimationState.IDLE;
+        foreach (var obj in InstantiatesObject)
+        {
+            obj.transform.rotation = cameraRotation;
+        }
+        
+    }
+
+    public void onClickPauseAnimation()
+    {
+        this._animationState = AnimationState.IDLE;
+    }
+
+    public void onClickStartAnimation()
+    {
+        this._animationState = AnimationState.GORIGHT;
+    }
+
+    public void onClickRightAnimation()
+    {
+        this._animationState = AnimationState.GORIGHT;
+    }
+
+    public void onClickGoLeftAnimation()
+    {
+        this._animationState = AnimationState.GOLEFT;
+    }
+
+    public void onClickSpeedUp()
+    {
+        this._animationSpeed += 0.5f;
+    }
+
+    public void onClickSpeedDown()
+    {
+        this._animationSpeed -= 0.5f;
+    }
+
+    void Update()
+    {
+        if (this._animationState == AnimationState.GORIGHT)
+        {
+            foreach (var obj in InstantiatesObject)
+            {
+                obj.transform.Rotate(0, this._animationSpeed, 0, Space.Self);
+                /*Vector3 position = obj.GetComponent<SphereCollider>().bounds.center;
+                obj.transform.RotateAround(position, new Vector3(0, 0.1f, 0), 30 * Time.deltaTime);*/
+            }
+        }
+    }
+
    private void RefreshText()
    {
        if (this.textToUpdate != null)
@ -97,6 +194,7 @@ public class ActiveScoppedElements : MonoBehaviour
    private GameObject FindGameObjectWithFormula()
    {
        var factory = MoleculeFactory.getInstrance(this.jsonFile);
+        factory.setAtomFactory(this._atomFactory);
        Debug.Log("ACTIVES ELEMENTS:");
        Debug.Log(this.actives);
        foreach (var formula in GetPermutations(this.actives.ToList()))
@ -109,21 +207,35 @@ public class ActiveScoppedElements : MonoBehaviour
        }
        return null;
    }
+
+    private String GetFormula()
+    {
+        var factory = MoleculeFactory.getInstrance(this.jsonFile);
+        factory.setAtomFactory(this._atomFactory);
+        foreach (var formula in GetPermutations(this.actives.ToList()))
+        {
+            Debug.Log("FORMULA: " + String.Join("", formula));
+            if (factory.hasMolecule(String.Join("", formula)))
+            {
+                return String.Join("", formula);
+            }
+        }
+        return null;
+    }
    
    private void RefreshAtom()
    {
        var objToFind = FindGameObjectWithFormula();
        if (objToFind != null)
        {
+            Debug.Log("Object to instantiate found !");
+            if (Camera.main == null)
+            {
+                throw new Exception("NO MAIN CAMERA DEFINED ");
+            }
            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.35f;
-
-            //var instantiatedObj = Instantiate(objt.obj, position, cameraRotation);
            
            objToFind.transform.position = position;
            objToFind.transform.localScale = new Vector3(0.05f, 0.05f, 0.05f);
@ -152,76 +264,39 @@ public class ActiveScoppedElements : MonoBehaviour
            InstantiatesObject.Clear();
            EnableAllMarkerModel();
        }
-        /*foreach (var objt in objectToInstantiates)
-        {
-            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;
-
-                // 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.35f;
-
-                //var instantiatedObj = Instantiate(objt.obj, position, cameraRotation);
-                
-                var obj = MoleculeFactory.getInstrance(this.jsonFile).createMolecule("CO2");
-                obj.transform.position = position;
-                obj.transform.localScale = new Vector3(0.05f, 0.05f, 0.05f);
-                obj.transform.rotation = cameraRotation;
-                Debug.Log("RefreshAtom(): Created " + obj.name);
-
-                obj.name = "[N] " + objt.obj.name;
-                InstantiatesObject.Add(obj);
-                this.OnInstantiateObject(obj);
-                Debug.Log("Instantiate " + obj.name);
-            }
-            else
-            {
-                var a = InstantiatesObject.FirstOrDefault(s => s.name == ("[N] " + objt.obj.name));
-                if (a != null)
-                {
-                    Debug.Log("Destroy " + a.name);
-                    InstantiatesObject.Remove(a);
-                    OnDestroyObject(a);
-                    Destroy(a);
-                    foreach (var disableGameObject in DisableGameObjects)
-                    {
-                        disableGameObject.SetActive(true);
-                    }
-                    DisableGameObjects.Clear();
-                }
-            }
-        }*/
-
-        if (InstantiatesObject.Count > 0)
-        {
+        
+        if (InstantiatesObject.Count > 0 && objectInstantiateText != null) {
            objectInstantiateText.text = String.Join(", ", InstantiatesObject.Select((s) => s.name));
-        }
-        else
-        {
+        } else if (objectInstantiateText != null) {
            objectInstantiateText.text = "En attente...";
        }
    }

+    private void SetMoleculeInfo(String formula)
+    {
+        if (formula == null) {
+            return;
+        }
+        var factory = MoleculeFactory.getInstrance(this.jsonFile);
+        factory.setAtomFactory(this._atomFactory);
+        Molecule mol = factory.GetMoleculeByFormula(formula);
+        var descriptionGO = GameObject.Find("TXT_DESC").GetComponent<TextMeshProUGUI>();
+        var atomNbGO = GameObject.Find("TXT_ATOM_NB").GetComponent<TextMeshProUGUI>();
+        var symGO = GameObject.Find("TXT_SYM").GetComponent<TextMeshProUGUI>();
+        var nameGO = GameObject.Find("TXT_NAME").GetComponent<TextMeshProUGUI>();
+        nameGO.text = mol.name;
+        symGO.text = mol.formula;
+        descriptionGO.text = "Masse moleculaire: ";
+        atomNbGO.text = mol.atoms.Length + " Atomes";
+    }
+
    private void OnInstantiateObject(GameObject obj)
    {
        foreach (var informationObj in InformationObjs)
        {
            informationObj.SetActive(true);
        }
+        SetMoleculeInfo(GetFormula());
        foreach (var debugObj in DebugObjs)
        {
            debugObj.SetActive(false);
@ -247,9 +322,4 @@ public class ActiveScoppedElements : MonoBehaviour
        RefreshText();
        RefreshAtom();
    }
-
-    void Update()
-    {
-        
-    }
 }
--- a/Assets/Editor/Vuforia/ImageTargetTextures/T-VIR/C_scaled.jpg
+++ b/Assets/Editor/Vuforia/ImageTargetTextures/T-VIR/C_scaled.jpg
--- a/Assets/Editor/Vuforia/ImageTargetTextures/T-VIR/C_scaled.jpg.meta
+++ b/Assets/Editor/Vuforia/ImageTargetTextures/T-VIR/C_scaled.jpg.meta
@ -0,0 +1,179 @@
+fileFormatVersion: 2
+guid: 28b9d8dbb107495ca4f8eee7c58c8331
+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
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 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: 1
+  swizzle: 50462976
+  cookieLightType: 2
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Lumin
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Editor/Vuforia/ImageTargetTextures/T-VIR/H_scaled.jpg
+++ b/Assets/Editor/Vuforia/ImageTargetTextures/T-VIR/H_scaled.jpg
--- a/Assets/Editor/Vuforia/ImageTargetTextures/T-VIR/H_scaled.jpg.meta
+++ b/Assets/Editor/Vuforia/ImageTargetTextures/T-VIR/H_scaled.jpg.meta
@ -0,0 +1,179 @@
+fileFormatVersion: 2
+guid: bef4d72022e54ca79ed956f8c53ba384
+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
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 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: 1
+  swizzle: 50462976
+  cookieLightType: 2
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Lumin
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Editor/Vuforia/ImageTargetTextures/T-VIR/O2_scaled.jpg
+++ b/Assets/Editor/Vuforia/ImageTargetTextures/T-VIR/O2_scaled.jpg
--- a/Assets/Editor/Vuforia/ImageTargetTextures/T-VIR/O2_scaled.jpg.meta
+++ b/Assets/Editor/Vuforia/ImageTargetTextures/T-VIR/O2_scaled.jpg.meta
@ -0,0 +1,179 @@
+fileFormatVersion: 2
+guid: 1203a963a0b24da48a481e62246ee716
+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
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 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: 1
+  swizzle: 50462976
+  cookieLightType: 2
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Lumin
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Editor/Vuforia/ImageTargetTextures/T-VIR/O3_scaled.jpg
+++ b/Assets/Editor/Vuforia/ImageTargetTextures/T-VIR/O3_scaled.jpg
--- a/Assets/Editor/Vuforia/ImageTargetTextures/T-VIR/O3_scaled.jpg.meta
+++ b/Assets/Editor/Vuforia/ImageTargetTextures/T-VIR/O3_scaled.jpg.meta
@ -0,0 +1,179 @@
+fileFormatVersion: 2
+guid: 39977f35879443cb8977b0765c069367
+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
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 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: 1
+  swizzle: 50462976
+  cookieLightType: 2
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Lumin
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Editor/Vuforia/ImageTargetTextures/T-VIR/O_scaled.jpg
+++ b/Assets/Editor/Vuforia/ImageTargetTextures/T-VIR/O_scaled.jpg
--- a/Assets/Editor/Vuforia/ImageTargetTextures/T-VIR/O_scaled.jpg.meta
+++ b/Assets/Editor/Vuforia/ImageTargetTextures/T-VIR/O_scaled.jpg.meta
@ -0,0 +1,179 @@
+fileFormatVersion: 2
+guid: 79979c2c9e3149a3aa74c3f3b1581859
+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
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 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: 1
+  swizzle: 50462976
+  cookieLightType: 2
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Lumin
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Editor/Vuforia/ImageTargetTextures/T-VIR/h2_scaled.jpg
+++ b/Assets/Editor/Vuforia/ImageTargetTextures/T-VIR/h2_scaled.jpg
--- a/Assets/Editor/Vuforia/ImageTargetTextures/T-VIR/h2_scaled.jpg.meta
+++ b/Assets/Editor/Vuforia/ImageTargetTextures/T-VIR/h2_scaled.jpg.meta
@ -0,0 +1,179 @@
+fileFormatVersion: 2
+guid: 173366883292404a8fb0129994277f47
+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
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 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: 1
+  swizzle: 50462976
+  cookieLightType: 2
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Lumin
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Editor/Vuforia/ImageTargetTextures/T-VIR/hydro_scaled.jpg.meta
+++ b/Assets/Editor/Vuforia/ImageTargetTextures/T-VIR/hydro_scaled.jpg.meta
@ -158,6 +158,19 @@ TextureImporter:
    ignorePlatformSupport: 0
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
  spriteSheet:
    serializedVersion: 2
    sprites: []
--- a/Assets/Editor/Vuforia/ImageTargetTextures/T-VIR/hydrogen_scaled.jpg.meta
+++ b/Assets/Editor/Vuforia/ImageTargetTextures/T-VIR/hydrogen_scaled.jpg.meta
@ -158,6 +158,19 @@ TextureImporter:
    ignorePlatformSupport: 0
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
  spriteSheet:
    serializedVersion: 2
    sprites: []
--- a/Assets/Editor/Vuforia/ImageTargetTextures/T-VIR/hydrogene_marker_scaled.jpg.meta
+++ b/Assets/Editor/Vuforia/ImageTargetTextures/T-VIR/hydrogene_marker_scaled.jpg.meta
@ -158,6 +158,19 @@ TextureImporter:
    ignorePlatformSupport: 0
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
  spriteSheet:
    serializedVersion: 2
    sprites: []
--- a/Assets/Editor/Vuforia/ImageTargetTextures/T-VIR/oxy_scaled.jpg.meta
+++ b/Assets/Editor/Vuforia/ImageTargetTextures/T-VIR/oxy_scaled.jpg.meta
@ -158,6 +158,19 @@ TextureImporter:
    ignorePlatformSupport: 0
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
  spriteSheet:
    serializedVersion: 2
    sprites: []
--- a/Assets/Editor/Vuforia/ImageTargetTextures/T-VIR/oxygen_scaled.jpg.meta
+++ b/Assets/Editor/Vuforia/ImageTargetTextures/T-VIR/oxygen_scaled.jpg.meta
@ -158,6 +158,19 @@ TextureImporter:
    ignorePlatformSupport: 0
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
  spriteSheet:
    serializedVersion: 2
    sprites: []
--- a/Assets/Editor/Vuforia/ImageTargetTextures/T-VIR/oxygene_marker_scaled.jpg.meta
+++ b/Assets/Editor/Vuforia/ImageTargetTextures/T-VIR/oxygene_marker_scaled.jpg.meta
@ -158,6 +158,19 @@ TextureImporter:
    ignorePlatformSupport: 0
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
  spriteSheet:
    serializedVersion: 2
    sprites: []
--- a/Assets/StreamingAssets/Vuforia/T-VIR.dat
+++ b/Assets/StreamingAssets/Vuforia/T-VIR.dat
--- a/Assets/StreamingAssets/Vuforia/T-VIR.dat.meta
+++ b/Assets/StreamingAssets/Vuforia/T-VIR.dat.meta
@ -1,2 +1,2 @@
 fileFormatVersion: 2
-guid: 8e38a451845b4f1ebfc6123150d7c5d0
+guid: 1a7d82f7fad541f78df7016101d3e776
--- a/Assets/StreamingAssets/Vuforia/T-VIR.xml
+++ b/Assets/StreamingAssets/Vuforia/T-VIR.xml
@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <QCARConfig>
  <Tracking>
-    <ImageTarget name="oxy" size="1.000000 1.000000" />
-    <ImageTarget name="hydro" size="1.000000 1.000000" />
+    <ImageTarget name="C" size="1.000000 1.000000" />
+    <ImageTarget name="O" size="1.000000 1.000000" />
+    <ImageTarget name="H" size="1.000000 1.000000" />
+    <ImageTarget name="O3" size="1.000000 1.000000" />
+    <ImageTarget name="O2" size="1.000000 1.000000" />
+    <ImageTarget name="h2" size="1.000000 1.000000" />
  </Tracking>
 </QCARConfig>
--- a/Assets/StreamingAssets/Vuforia/T-VIR.xml.meta
+++ b/Assets/StreamingAssets/Vuforia/T-VIR.xml.meta
@ -1,2 +1,2 @@
 fileFormatVersion: 2
-guid: 313ab4a139e843ed96cbfc6e776ee394
+guid: 7c69adbb1eb240618f9f726726ddbe54
--- a/Materials/LiberationSans
+++ b/Materials/LiberationSans
--- a/Assets/XR/Settings/OpenXR
+++ b/Assets/XR/Settings/OpenXR
@ -348,10 +348,11 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 9f0ebc320a151d3408ea1e9fce54d40e, type: 3}
  m_Name: OpenXR Package Settings
  m_EditorClassIdentifier: 
-  Keys: 0100000007000000
+  Keys: 01000000070000000d000000
  Values:
  - {fileID: -2820601610673514729}
  - {fileID: -7933880819051152802}
+  - {fileID: 2102387217465899027}
 --- !u!114 &328694643663705065
 MonoBehaviour:
  m_ObjectHideFlags: 0
@ -455,6 +456,21 @@ MonoBehaviour:
  company: Unity
  priority: 0
  required: 0
+--- !u!114 &2102387217465899027
+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: b5a1f07dc5afe854f9f12a4194aca3fb, type: 3}
+  m_Name: WebGL
+  m_EditorClassIdentifier: 
+  features: []
+  m_renderMode: 1
+  m_depthSubmissionMode: 0
 --- !u!114 &2292148946669457467
 MonoBehaviour:
  m_ObjectHideFlags: 0
--- a/Assets/__Scenes/CompositionMode.unity
+++ b/Assets/__Scenes/CompositionMode.unity
--- a/Assets/__Scenes/MainMenu.unity
+++ b/Assets/__Scenes/MainMenu.unity
@ -342,7 +342,7 @@ GameObject:
  m_Component:
  - component: {fileID: 534669306}
  - component: {fileID: 534669305}
-  - component: {fileID: 534669304}
+  - component: {fileID: 534669307}
  m_Layer: 0
  m_Name: EventSystem
  m_TagString: Untagged
@ -350,26 +350,6 @@ GameObject:
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
  m_IsActive: 1
--- !u!114 &534669304
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 534669303}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_SendPointerHoverToParent: 1
-  m_HorizontalAxis: Horizontal
-  m_VerticalAxis: Vertical
-  m_SubmitButton: Submit
-  m_CancelButton: Cancel
-  m_InputActionsPerSecond: 10
-  m_RepeatDelay: 0.5
-  m_ForceModuleActive: 0
 --- !u!114 &534669305
 MonoBehaviour:
  m_ObjectHideFlags: 0
@ -400,6 +380,36 @@ Transform:
  m_Children: []
  m_Father: {fileID: 0}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &534669307
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 534669303}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 01614664b831546d2ae94a42149d80ac, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_SendPointerHoverToParent: 1
+  m_MoveRepeatDelay: 0.5
+  m_MoveRepeatRate: 0.1
+  m_XRTrackingOrigin: {fileID: 0}
+  m_ActionsAsset: {fileID: -944628639613478452, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
+  m_PointAction: {fileID: -1654692200621890270, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
+  m_MoveAction: {fileID: -8784545083839296357, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
+  m_SubmitAction: {fileID: 392368643174621059, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
+  m_CancelAction: {fileID: 7727032971491509709, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
+  m_LeftClickAction: {fileID: 3001919216989983466, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
+  m_MiddleClickAction: {fileID: -2185481485913320682, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
+  m_RightClickAction: {fileID: -4090225696740746782, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
+  m_ScrollWheelAction: {fileID: 6240969308177333660, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
+  m_TrackedDevicePositionAction: {fileID: 6564999863303420839, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
+  m_TrackedDeviceOrientationAction: {fileID: 7970375526676320489, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
+  m_DeselectOnBackgroundClick: 1
+  m_PointerBehavior: 0
+  m_CursorLockBehavior: 0
 --- !u!1 &693850225
 GameObject:
  m_ObjectHideFlags: 0
--- a/Assets/script/AtomeFactory.cs
+++ b/Assets/script/AtomeFactory.cs
@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+using UnityEngine;
+
+
+
+public class AtomeFactory : MonoBehaviour{
+
+    public TextAsset jsonFile;
+
+    private static AtomeFactory instance;
+
+    private AtomesInformation atomeInJson;
+
+    private Dictionary<string, AtomeInformation> AtomeDictionary; 
+
+    public AtomeFactory(TextAsset jsonFile){
+        AtomeFactory.instance = this;
+        AtomeDictionary = new Dictionary<string, AtomeInformation>();
+        atomeInJson = JsonUtility.FromJson<AtomesInformation>(jsonFile.text);
+        foreach (var atome in atomeInJson.atomes){
+            AtomeDictionary.Add(atome.symbol, atome);
+        }
+    }
+
+    public static AtomeFactory getInstrance() {
+        if(AtomeFactory.instance == null){
+            Debug.LogError("no Json file");
+        }
+        return AtomeFactory.instance;
+    }
+
+        public static AtomeFactory getInstrance(TextAsset jsonFile){
+        if(AtomeFactory.instance == null){
+            AtomeFactory.instance = new AtomeFactory(jsonFile);
+        }
+        return AtomeFactory.instance;
+    }
+
+    public AtomeInformation createAtome(string symbol){
+        if(!AtomeDictionary.ContainsKey(symbol)){
+            Debug.LogError("Atome does not existe in json");
+        }
+        AtomeInformation atome = AtomeDictionary[symbol];
+        
+        return atome;
+    }
+
+}
--- a/Assets/script/AtomeFactory.cs.meta
+++ b/Assets/script/AtomeFactory.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 455447ed8d2676a4ba2d5cf8247bd83c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/script/AtomeInformation.cs
+++ b/Assets/script/AtomeInformation.cs
@ -0,0 +1,37 @@
+
+using System.Collections.Generic;
+using System;
+
+[System.Serializable]
+public class AtomeProps {
+    public string yeardiscovered;
+    public string atomicmass;
+    public string standardstate;
+    public string groupblock;
+    public string discovered_by;
+    public string named_by;
+}
+
+[System.Serializable]
+public class Representation {
+    public string color;
+}
+
+[System.Serializable]
+public class AtomeInformation
+{
+    public int atomicNumber;
+    public string symbol;
+    public string name;
+    public int protons;
+    public int neutrons;
+    public AtomeProps properties;
+    public Representation representation;
+}
+
+[System.Serializable]
+public class AtomesInformation
+{
+    // liste des liason entre les atoms
+    public AtomeInformation[] atomes;
+}
--- a/Assets/script/AtomeInformation.cs.meta
+++ b/Assets/script/AtomeInformation.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d2ff888d2e46a254ebb339c8dd3ed083
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/script/FactoryTester.cs
+++ b/Assets/script/FactoryTester.cs
@ -0,0 +1,25 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+
+
+
+class MoleculeFactoryTester: MonoBehaviour {
+
+    public TextAsset moleculeJson;
+    public TextAsset atomJson;
+
+    void Start(){
+        MoleculeFactory factory = MoleculeFactory.getInstrance(this.moleculeJson);
+        AtomeFactory atomeFactory = AtomeFactory.getInstrance(this.atomJson);
+        factory.setAtomFactory(atomeFactory);
+        GameObject mol = factory.createMolecule("O2");
+        GameObject mol2 = factory.createMolecule("H2O");
+        mol.transform.position = new Vector3(0,1,0);
+        GameObject mol3 = factory.createMolecule("C4H10");
+        mol3.transform.position = new Vector3(0,5,0);
+        //GameObject bon = GameOject.CreatePrimitive(PrimitiveType.)
+    }
+
+}
--- a/Assets/script/FactoryTester.cs.meta
+++ b/Assets/script/FactoryTester.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 8c2433f4f2c3ba343851fdf3c660c21e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/script/Molecul.json
+++ b/Assets/script/Molecul.json
@ -1,5 +1,32 @@
 {
    "molecules":[
+        {
+            "name": "Méthanal",
+            "formula": "CH2O",
+            "atoms": [
+                {
+                    "element": "C",
+                    "geometry": [0.0, 0.0, 0.0]
+                },
+                {
+                    "element": "H2",
+                    "geometry": [0.0, 1.0, 2.0]
+                },
+                {
+                    "element": "O",
+                    "geometry": [1.2, 0.0, 0.0]
+                }
+            ],
+            "bonds": [
+                {"atoms": [0, 1], "order": 1},
+                {"atoms": [1, 2], "order": 1}
+            ],
+            "properties": {
+                "molecularMass": 32.0,
+                "meltingPoint": -218.8,
+                "boilingPoint": -183.0
+            }
+        },
        {
            "name": "Dioxygène",
            "formula": "O2",
@ -93,6 +120,23 @@
                "meltingPoint": -138.3,
                "boilingPoint": -0.5
            }
+        },{
+            "name": "Eau",
+            "formula": "H2O",
+            "atoms": [
+                {"element": "O", "geometry": [0.0, 0.0, 0.0]},
+                {"element": "H", "geometry": [1.2, 0.0, 0.0]},
+                {"element": "H", "geometry": [-1.2, 0.0, 0.0]}
+            ],
+            "bonds": [
+                {"atoms": [0, 1], "order": 1},
+                {"atoms": [0, 2], "order": 1}
+            ],
+            "properties": {
+                "molecularMass": 18.01528,
+                "meltingPoint": 0.0,
+                "boilingPoint": 100.0
+            }
        }
    ]
 }
--- a/Assets/script/MoleculeFactory.cs
+++ b/Assets/script/MoleculeFactory.cs
@ -2,17 +2,16 @@ using System;
 using System.Collections.Generic;
 using UnityEngine;

-
-
 public class MoleculeFactory : MonoBehaviour{

    public TextAsset jsonFile;

+    private AtomeFactory atomeFactory;
    private static MoleculeFactory instance;

    private Molecules moleculesInJson;

-    private Dictionary<string, Molecule>  moleculesDictionary; 
+    private Dictionary<string, Molecule>  moleculesDictionary;

    public MoleculeFactory(TextAsset jsonFile){
        MoleculeFactory.instance = this;
@ -37,10 +36,10 @@ public class MoleculeFactory : MonoBehaviour{
        return MoleculeFactory.instance;
    }

-        public Boolean hasMolecule(String formula)
-        {
-            return moleculesDictionary.ContainsKey(formula);
-        }
+    public Boolean hasMolecule(String formula)
+    {
+        return moleculesDictionary.ContainsKey(formula);
+    }

    public GameObject createMolecule (string formula){
        if(!moleculesDictionary.ContainsKey(formula)){
@ -50,15 +49,72 @@ public class MoleculeFactory : MonoBehaviour{
        GameObject sortie = new GameObject(molecule.name);
        foreach (Atom atom in molecule.atoms) {
            var template = GameObject.Find("SPHERE");
-            var createdObj = Instantiate(template, new Vector3(atom.geometry[0], atom.geometry[1], atom.geometry[2]), Quaternion.identity);
-            createdObj.transform.parent = sortie.transform;
-            createdObj.name = atom.element;
-            createdObj.transform.localPosition = new Vector3(atom.geometry[0], atom.geometry[1], atom.geometry[2]);
-            //TODO: géré les laision
-            //TODO: géré la taille de l'atome
-            //TODO: géré la couleur de l'atome
+            var sphere = Instantiate(template, new Vector3(atom.geometry[0], atom.geometry[1], atom.geometry[2]), Quaternion.identity);
+            //GameObject sphere = GameObject.CreatePrimitive(PrimitiveType.Sphere);
+            sphere.transform.parent = sortie.transform;
+            sphere.name = atom.element;
+            sphere.transform.localPosition = new Vector3(atom.geometry[0], atom.geometry[1], atom.geometry[2]);
+            AtomeInformation att = atomeFactory.createAtome(atom.element);
+            Color myColor = new Color(0, 0, 1, 1);
+            ColorUtility.TryParseHtmlString(att.representation.color, out myColor);
+            sphere.GetComponent<Renderer>().material.color = myColor;
+        }
+        foreach (Bond bond in molecule.bonds){
+            float atom1x = molecule.atoms[bond.atoms[0]].geometry[0];
+            float atom2x = molecule.atoms[bond.atoms[1]].geometry[0];
+            float atom1y = molecule.atoms[bond.atoms[0]].geometry[1];
+            float atom2y = molecule.atoms[bond.atoms[1]].geometry[1];
+            float atom1z = molecule.atoms[bond.atoms[0]].geometry[2];
+            float atom2z = molecule.atoms[bond.atoms[1]].geometry[2];
+            Vector3 vecAtom1 = new Vector3(atom1x, atom1y, atom1z);
+            Vector3 vecAtom2 = new Vector3(atom2x, atom2y, atom2z);
+            GameObject GObond = CreateCylinderBetweenPoints(vecAtom1,vecAtom2, 0.3f);
+            GObond.transform.parent = sortie.transform;
        }
        return sortie;
    }

+    public Molecule GetMoleculeByFormula(String formula)
+    {
+        if (!hasMolecule(formula))
+        {
+            return null;
+        }
+        Molecule molecule = moleculesDictionary[formula];
+        return molecule;
+    }
+
+    public Dictionary<String, AtomeInformation> GetAtomsInfoByFormula(String formula)
+    {
+        if (!hasMolecule(formula))
+        {
+            return null;
+        }
+        Dictionary<String, AtomeInformation> dictionary = new Dictionary<string, AtomeInformation>();
+        Molecule molecule = moleculesDictionary[formula];
+        foreach (var atom in molecule.atoms)
+        {
+            dictionary.Add(atom.element, atomeFactory.createAtome(atom.element));
+        }
+
+        return dictionary;
+    }
+
+    public void setAtomFactory(AtomeFactory atomeFactory){
+        this.atomeFactory = atomeFactory;
+    }
+
+    private GameObject CreateCylinderBetweenPoints(Vector3 start, Vector3 end, float width){
+        var offset = end - start;
+        var scale = new Vector3(width, offset.magnitude / 2.0f, width);
+        var position = start + (offset / 2.0f);
+
+        var cylinderPrefab = GameObject.CreatePrimitive(PrimitiveType.Cylinder);
+        cylinderPrefab.transform.position = position;
+        cylinderPrefab.transform.rotation = Quaternion.identity;
+        cylinderPrefab.transform.up = offset;
+        cylinderPrefab.transform.localScale = scale;
+        return cylinderPrefab;
+    }
+
 }
--- a/Assets/script/atomes.json
+++ b/Assets/script/atomes.json
--- a/Assets/script/atomes.json.meta
+++ b/Assets/script/atomes.json.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: ab8f44086e6af6f48a38b7d7d595e9a2
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/QCAR/somedata16
+++ b/QCAR/somedata16
@ -1 +1 @@
-AAABmQWapYRGu7Loo2wvgwZUGzXNOVLSaix1jbBp7+6hM1WFhjBkddUoLqWxkauNc7gcguqgEle3Gl3JhXdUv8TOSygVCeRnuokmoncR2/5V78p0F0Cfn5gBebVC39W8GQ6XkVyp75Y8d30EG+W8VKPfuse2cfavkxXpI2Nl3LSy0VRONL0XNPimQXCFL0ahAeUkOc37yrfYL9FrG7wg4Rw+k4YLs++CGJhpcKysknksOgQGrDLh9Hj9lfoKw+YWYwvTA55r6X388fA3hXuRGNehejMd4orrTqM65do7Uf0KR4eC/KXr5cmkSwN4FwRxWaGm16G0tXit+hD29lyZbT/XJ64=
+AAABmY7g9UmlfucNZM2mK1+zBTca7O7gdAXUc9FcH4yUbYfsFOfH72rVb0qPESQq/9HBlqfD04SyJF6jtD6oQDsZxFAYgmMCBkOzNr/C/s4mdV37Qw5Nm9GqecPYpccvAWOqH/VAtFBp5ksgnAnVhuHUqh0NmvpixXq82Meo/bg7usPAWSDsQt/6kR89nttLOknq/Rt+SN8E91Txj6nsYZH8gsxrgC9MYPO0koHuIvfeLk0wcqrMzxZawaNLp6CNWgUYDXWIWW1AtB9dY5p56nnk/Yd4MyRevYDtcWdXCdiam48zdO470AuA8DkAFHOttVURidwRkVKq4z40E6J+5V3NqDg=
Author	SHA1	Message	Date
Nicolas	58782722d3	rajout de la gestion d'animation + des factory	2024-01-18 16:28:39 +01:00
Nicolas	9de97ad486	Merge remote-tracking branch 'origin/develop' into feature/molecule # Conflicts: # Assets/script/MoleculeFactory.cs	2024-01-18 13:53:20 +01:00
Nicolas	cb0396e23c	Merge pull request 'feat: liaison entre les molécules et couleur' (#9 ) from feat/molecule/bons into develop Reviewed-on: #9 Reviewed-by: Mathis <mathis.ragot@epitech.eu>	2024-01-18 14:47:23 +01:00
Nicolas	aca2898e8c	Merge remote-tracking branch 'origin/develop' into feat/molecule/bons # Conflicts: # Assets/Editor/Vuforia/ImageTargetTextures/T-VIR/hydro_scaled.jpg.meta # Assets/Editor/Vuforia/ImageTargetTextures/T-VIR/hydrogen_scaled.jpg.meta # Assets/Editor/Vuforia/ImageTargetTextures/T-VIR/hydrogene_marker_scaled.jpg.meta # Assets/Editor/Vuforia/ImageTargetTextures/T-VIR/oxy_scaled.jpg.meta # Assets/Editor/Vuforia/ImageTargetTextures/T-VIR/oxygen_scaled.jpg.meta # Assets/Editor/Vuforia/ImageTargetTextures/T-VIR/oxygene_marker_scaled.jpg.meta # Assets/XR/Settings/OpenXR Package Settings.asset # Assets/__Scenes/MainMenu.unity	2024-01-18 13:46:44 +01:00
clement	1bf7031f32	on est good	2024-01-18 14:24:40 +01:00
clement	5ca3d16a29	Squashed commit of the following: commit 807aa8c3c6e62c5d033064e3190ae432fb66db03 Merge: 34f74aa 3777d06 Author: Clement <clement@jo85.com> Date: Thu Jan 18 12:02:57 2024 +0100 Merge pull request 'add Atomes Factory' (#10) from feature/AtomesFactory into develop Reviewed-on: #10 Reviewed-by: Clement <clement@jo85.com> commit 3777d06a0ee942994fdfe90d71fc5056c37346d9 Author: Mathis <mathis.ragot@epitech.eu> Date: Thu Jan 18 12:00:00 2024 +0100 Rename Classname commit 16bd5bfb6cd51e253e22417ab8196a58e1726849 Merge: da9d57b 34f74aa Author: Mathis <mathis.ragot@epitech.eu> Date: Thu Jan 18 11:46:03 2024 +0100 Merge remote-tracking branch 'origin/develop' into feature/AtomesFactory commit da9d57b0bba34dbe24f5e7f744ce60f430832ff4 Author: Mathis <mathis.ragot@epitech.eu> Date: Thu Jan 18 11:44:22 2024 +0100 vue foria config commit 5346e596c8a0db7684b64920c328abee459926d9 Author: Mathis <mathis.ragot@epitech.eu> Date: Thu Jan 18 11:28:02 2024 +0100 [feature/AtomesFactory] - remove testing file commit f613217658cf2f1f48ceeeaa3183e515de857213 Author: Mathis <mathis.ragot@epitech.eu> Date: Thu Jan 18 10:38:59 2024 +0100 [feature/AtomesFactory] - Add json for atomes commit bc2b9e02fdb692d56937bd37cc3d821ffb717424 Author: Mathis <mathis.ragot@epitech.eu> Date: Fri Jan 12 15:37:09 2024 +0100 add Atomes Factory commit 34f74aa44366c6d5f9e0d647a7837704edbd5fad Merge: 8b6d07f f181fd9 Author: Nicolas <nicolas.sansd@gmail.com> Date: Fri Jan 12 11:50:43 2024 +0100 Merge pull request 'feature/multi_targets' (#7) from feature/multi_targets into develop Reviewed-on: #7 Reviewed-by: Clement <clement@jo85.com> commit f181fd993504c811a4546e56f83eb05ed62a625d Author: Nicolas <nicolas.sansd@gmail.com> Date: Fri Jan 12 11:50:10 2024 +0100 fix du mauvais nom de scene dans le script ChangeScene.cs commit 1c76868eee12406d6c39fa64da8462e35019a39e Merge: f1ec062 8b6d07f Author: Nicolas <nicolas.sansd@gmail.com> Date: Fri Jan 12 11:39:02 2024 +0100 Merge remote-tracking branch 'origin/develop' into feature/multi_targets commit f1ec062047ba68d48493b25273ba5893f42a890f Author: Nicolas <nicolas.sansd@gmail.com> Date: Fri Jan 12 11:37:29 2024 +0100 ajout du font fallback commit 9c23975b204ceb09bd3ccc57b847cf0a8158fb95 Author: Nicolas <nicolas.sansd@gmail.com> Date: Fri Jan 12 11:36:49 2024 +0100 rajouts des fonts text mesh pro commit aff9df22cfbed9e8b317cafe4269fce891a5bbe5 Merge: a791273 73394e5 Author: Nicolas <nicolas.sansd@gmail.com> Date: Fri Jan 12 11:03:32 2024 +0100 Merge remote-tracking branch 'origin/develop' into feature/multi_targets commit a7912733e5fed60b9514c778fd9f40661dc66b64 Author: Nicolas <nicolas.sansd@gmail.com> Date: Fri Jan 12 10:54:51 2024 +0100 Ajout dans le canvas d'éléments UI (nom, description....) commit 0313fe28a1b718152015a401fda32069e94303c0 Author: Nicolas <nicolas.sansd@gmail.com> Date: Fri Jan 12 09:57:07 2024 +0100 Suppression du build de la CI commit 5237a32bb4759c43104e9397cb43b328a99b7c62 Author: Nicolas <nicolas.sansd@gmail.com> Date: Thu Jan 11 16:18:35 2024 +0100 ajout de la keystore de debug (user) + changement de la target version d'android commit afa265dd3141ef3fd96bff685ca655594453a876 Author: Nicolas <nicolas.sansd@gmail.com> Date: Thu Jan 11 11:26:53 2024 +0100 Affichage des molécules unitairement et en mode fusion commit 84136dcc5c3b00603ba8531901418125a832a255 Author: Nicolas <nicolas.sansd@gmail.com> Date: Fri Dec 22 15:05:47 2023 +0100 MAJ du fichier d'action build.yaml commit ce3c95654431f25e22810481f3b10b24f158decd Author: Nicolas <nicolas.sansd@gmail.com> Date: Fri Dec 22 15:02:10 2023 +0100 MAJ du fichier d'action build.yaml commit 8f105732f7aaa41689894ab388675ae0b79f66f6 Author: Nicolas <nicolas.sansd@gmail.com> Date: Fri Dec 22 14:36:52 2023 +0100 Ajout de la multitarget pour générer un préfab	2024-01-18 14:00:09 +01:00
Nicolas	8ca1aa7ad8	Ajout de composants et de leurs markers	2024-01-18 13:45:04 +01:00
clement	824a8fdbc6	feat: WIP color	2024-01-18 12:03:38 +01:00
Clement	807aa8c3c6	Merge pull request 'add Atomes Factory' (#10 ) from feature/AtomesFactory into develop Reviewed-on: #10 Reviewed-by: Clement <clement@jo85.com>	2024-01-18 12:02:57 +01:00
Mathis	3777d06a0e	Rename Classname	2024-01-18 12:00:00 +01:00
Mathis	16bd5bfb6c	Merge remote-tracking branch 'origin/develop' into feature/AtomesFactory	2024-01-18 11:46:03 +01:00
Mathis	da9d57b0bb	vue foria config	2024-01-18 11:44:22 +01:00
Mathis	5346e596c8	[feature/AtomesFactory] - remove testing file	2024-01-18 11:28:02 +01:00
clement	c302d4c277	color okay	2024-01-18 11:25:51 +01:00
Mathis	f613217658	[feature/AtomesFactory] - Add json for atomes	2024-01-18 10:38:59 +01:00
clement	13c59458bb	sync	2024-01-12 16:28:35 +01:00
Mathis	bc2b9e02fd	add Atomes Factory	2024-01-12 15:37:09 +01:00
Nicolas	34f74aa443	Merge pull request 'feature/multi_targets' (#7 ) from feature/multi_targets into develop Reviewed-on: #7 Reviewed-by: Clement <clement@jo85.com>	2024-01-12 11:50:43 +01:00