From 33e34e9fde556dfc166907bce350e4b9b0867317 Mon Sep 17 00:00:00 2001
From: clement <clement@jo85.com>
Date: Thu, 11 Jan 2024 16:53:06 +0100
Subject: [PATCH] convert to dict

---
 Assets/script/MoleculeFactory.cs | 25 +++++++++----------------
 Assets/script/Molecules.cs       |  5 ++++-
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/Assets/script/MoleculeFactory.cs b/Assets/script/MoleculeFactory.cs
index 71aec46..8f56ee1 100644
--- a/Assets/script/MoleculeFactory.cs
+++ b/Assets/script/MoleculeFactory.cs
@@ -16,10 +16,11 @@ public class MoleculeFactory : MonoBehaviour{
 
     public MoleculeFactory(TextAsset jsonFile){
         MoleculeFactory.instance = this;
-        moleculesInJson = JsonUtility.FromJson<List<Molecule>>(jsonFile.text);
-        Debug.Log(jsonFile.text);
-        moleculesDictionary = BuildMoleculesDictionary(moleculesInJson);
-
+        moleculesDictionary = new Dictionary<string, Molecule>();
+        moleculesInJson = JsonUtility.FromJson<Molecules>(jsonFile.text);
+        foreach (var molecule in moleculesInJson.molecules){
+            moleculesDictionary.Add(molecule.formula, molecule);
+        }
     }
 
     public static MoleculeFactory getInstrance(){
@@ -37,20 +38,12 @@ public class MoleculeFactory : MonoBehaviour{
     }
 
     public GameObject createMolecule (string formula){
-
-        Debug.Log(moleculesInJson);
-
-        // Molecule molecule = molecules[formula];
-
-        foreach(var item in moleculesInJson.molecules){
-            Debug.Log("pouet2");
-            Debug.Log(item.Key);
-            Debug.Log(item.Value);
+        if(!moleculesDictionary.ContainsKey(formula)){
+            Debug.LogError("molecules does not existe in json")
         }
+        Molecule molecule = moleculesDictionary[formula];
 
-        // Debug.Log(molecule);
-
-        // make your shit
+        Debug.Log(molecule);
 
         //return GO
         return null;
diff --git a/Assets/script/Molecules.cs b/Assets/script/Molecules.cs
index 7e4d19b..c4eec61 100644
--- a/Assets/script/Molecules.cs
+++ b/Assets/script/Molecules.cs
@@ -6,6 +6,9 @@ public class Molecule
     // nom molécules
     public string name;
 
+    // formule melécule
+    public string formula;
+
     // liste des atoms
     public Atom[] atoms;
 
@@ -20,5 +23,5 @@ public class Molecule
 public class Molecules
 {
     // liste des liason entre les atoms
-    public Dictionary<string,Molecule> molecules;
+    public Molecule[] molecules;
 }
\ No newline at end of file