2024-02-02 15:43:29 +00:00
13 changed files with 166 additions and 18 deletions
--- 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/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/MainMenu.unity
+++ b/Assets/__Scenes/MainMenu.unity
@ -38,7 +38,7 @@ RenderSettings:
  m_ReflectionIntensity: 1
  m_CustomReflection: {fileID: 0}
  m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.3708985, g: 0.37837005, b: 0.3572253, a: 1}
+  m_IndirectSpecularColor: {r: 0.37311918, g: 0.3807398, b: 0.35872716, a: 1}
  m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@ -332,6 +332,52 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 136169417}
  m_CullTransparentMesh: 1
+--- !u!1 &524575261
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 524575263}
+  - component: {fileID: 524575262}
+  m_Layer: 0
+  m_Name: GameObject
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &524575262
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 524575261}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8c2433f4f2c3ba343851fdf3c660c21e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  moleculeJson: {fileID: 4900000, guid: 3a11d0f923ae50c4d82ee1dda0f629a3, type: 3}
+  atomJson: {fileID: 4900000, guid: ab8f44086e6af6f48a38b7d7d595e9a2, type: 3}
+--- !u!4 &524575263
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 524575261}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -0.5532938, y: -1.3569599, z: -4.0075746}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &534669303
 GameObject:
  m_ObjectHideFlags: 0
@ -1250,3 +1296,4 @@ SceneRoots:
  - {fileID: 693850230}
  - {fileID: 732397232}
  - {fileID: 534669306}
+  - {fileID: 524575263}
--- a/Assets/script/FactoryTester.cs
+++ b/Assets/script/FactoryTester.cs
@ -7,13 +7,18 @@ using UnityEngine;

 class MoleculeFactoryTester: MonoBehaviour {

-    public TextAsset jsonFile;
+    public TextAsset moleculeJson;
+    public TextAsset atomJson;

    void Start(){
-        MoleculeFactory factory = MoleculeFactory.getInstrance(this.jsonFile);
-        //GameObject mol = factory.createMolecule("O2");
+        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);
+        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/Molecul.json
+++ b/Assets/script/Molecul.json
@ -97,13 +97,13 @@
            "name": "Eau",
            "formula": "H2O",
            "atoms": [
-                {"element": "H", "geometry": [0.0, 0.0, 0.0]},
-                {"element": "O", "geometry": [0.74, 0.0, 0.0]},
-                {"element": "H", "geometry": [-0.74, 0.0, 0.0]}
+                {"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": [1, 2], "order": 1}
+                {"atoms": [0, 2], "order": 1}
            ],
            "properties": {
                "molecularMass": 18.01528,
--- a/Assets/script/MoleculeFactory.cs
+++ b/Assets/script/MoleculeFactory.cs
@ -8,8 +8,7 @@ public class MoleculeFactory : MonoBehaviour{

    public TextAsset jsonFile;

-    //public AtomeFactory atomeFactory = AtomeFactory.getInstrance(this.jsonFile);
-
+    private AtomeFactory atomeFactory;
    private static MoleculeFactory instance;

    private Molecules moleculesInJson;
@ -51,10 +50,9 @@ public class MoleculeFactory : MonoBehaviour{
            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 = Atomfactory.createAtome(atom.element);
+            AtomeInformation att = atomeFactory.createAtome(atom.element);
            Color myColor = new Color(0, 0, 1, 1);
-            //TODO géré atom factory
-            //ColorUtility.TryParseHtmlString(att.representation.color, out myColor);
+            ColorUtility.TryParseHtmlString(att.representation.color, out myColor);
            sphere.GetComponent<Renderer>().material.color = myColor;
        }
        foreach (Bond bond in molecule.bonds){
@ -66,12 +64,16 @@ public class MoleculeFactory : MonoBehaviour{
            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.5f);
+            GameObject GObond = CreateCylinderBetweenPoints(vecAtom1,vecAtom2, 0.3f);
            GObond.transform.parent = sortie.transform;
        }
        return sortie;
    }

+    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);
--- a/QCAR/lh
+++ b/QCAR/lh
@ -1 +1 @@
-*<2A>*'	wֹ°~<7E>*v2A<32>Iם`›א׃¦(״W÷÷Y
+SYa2¶q‚†[‚×"b<>	%SúûïxY¥Že.
--- a/QCAR/somedata16
+++ b/QCAR/somedata16
@ -1 +1 @@
-AAABmY7g9UmlfucNZM2mK1+zBTca7O7gdAXUc9FcH4yUbYfsFOfH72rVb0qPESQq/9HBlqfD04SyJF6jtD6oQDsZxFAYgmMCBkOzNr/C/s4mdV37Qw5Nm9GqecPYpccvAWOqH/VAtFBp5ksgnAnVhuHUqh0NmvpixXq82Meo/bg7usPAWSDsQt/6kR89nttLOknq/Rt+SN8E91Txj6nsYZH8gsxrgC9MYPO0koHuIvfeLk0wcqrMzxZawaNLp6CNWgUYDXWIWW1AtB9dY5p56nnk/Yd4MyRevYDtcWdXCdiam48zdO470AuA8DkAFHOttVURidwRkVKq4z40E6J+5V3NqDg=
+AAABmYLL8/oCWYDVnt66QIDwPq6z4DN6r3/58aZWC0zcxYa43TCnvCp9IGuXZLgAObCqIm1fhMsWLttc6QAE6obPbuzCjEssQlT41wW38sIVuVhmsw6vfjVsXAQG/GQOgamARLtOkhTKi309FNa+3akhJu9wuEv5jF3vfRbPBoeMCWZuk4Pr8aP7mPH8+10geWHoSWbxgsaEEgrE0yO2xoQwTy2XOmCzZytqk+moWXU7VBu+0//q+koDSnWbjOkEGUfRwMmBJIK9J5TDJrSf/QZYBcEx1daR47cicuXzCb81VtaSvU5VIb9anoX6fukOHe/nCAfsltXFn+4G24NKlejZ568=