From a6cf8340bfdc04d684d7517bc2fad7bc1ae67668 Mon Sep 17 00:00:00 2001 From: clement Date: Sat, 6 Jan 2024 15:51:13 +0100 Subject: [PATCH 1/9] add molecule reader script --- Assets/script/Atom.cs | 9 +++++++++ Assets/script/Atom.cs.meta | 11 +++++++++++ Assets/script/Bond.cs | 9 +++++++++ Assets/script/Bond.cs.meta | 11 +++++++++++ Assets/script/Molecul.json | 26 ++++++++++++++++++++++++++ Assets/script/Molecul.json.meta | 7 +++++++ Assets/script/Molecules.cs | 25 +++++++++++++++++++++++++ Assets/script/Molecules.cs.meta | 11 +++++++++++ Assets/script/Properties.cs | 10 ++++++++++ Assets/script/Properties.cs.meta | 11 +++++++++++ Assets/script/ReadMolecule.cs | 23 +++++++++++++++++++++++ 11 files changed, 153 insertions(+) create mode 100644 Assets/script/Atom.cs create mode 100644 Assets/script/Atom.cs.meta create mode 100644 Assets/script/Bond.cs create mode 100644 Assets/script/Bond.cs.meta create mode 100644 Assets/script/Molecul.json create mode 100644 Assets/script/Molecul.json.meta create mode 100644 Assets/script/Molecules.cs create mode 100644 Assets/script/Molecules.cs.meta create mode 100644 Assets/script/Properties.cs create mode 100644 Assets/script/Properties.cs.meta create mode 100644 Assets/script/ReadMolecule.cs diff --git a/Assets/script/Atom.cs b/Assets/script/Atom.cs new file mode 100644 index 0000000..bb74bbd --- /dev/null +++ b/Assets/script/Atom.cs @@ -0,0 +1,9 @@ +[System.Serializable] +public class Atom +{ + // nom de l'atom + public string element; + + // coordonée XYZ + public float[] geometry; +} \ No newline at end of file diff --git a/Assets/script/Atom.cs.meta b/Assets/script/Atom.cs.meta new file mode 100644 index 0000000..7d83319 --- /dev/null +++ b/Assets/script/Atom.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9d3069c87e06b0c4c9a88c0695461936 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/script/Bond.cs b/Assets/script/Bond.cs new file mode 100644 index 0000000..2b624b5 --- /dev/null +++ b/Assets/script/Bond.cs @@ -0,0 +1,9 @@ +[System.Serializable] +public class Bond +{ + // numéro des atome lier + public int[] atoms; + + // nombre de liaison + public int order; +} \ No newline at end of file diff --git a/Assets/script/Bond.cs.meta b/Assets/script/Bond.cs.meta new file mode 100644 index 0000000..2f870d7 --- /dev/null +++ b/Assets/script/Bond.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5ee91233baa5bef4288717efd423d4df +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/script/Molecul.json b/Assets/script/Molecul.json new file mode 100644 index 0000000..073d783 --- /dev/null +++ b/Assets/script/Molecul.json @@ -0,0 +1,26 @@ +{ + "molecules":[ + { + "name": "Dioxygène", + "formula": "O2", + "atoms": [ + { + "element": "O", + "geometry": [0.0, 0.0, 0.0] + }, + { + "element": "O", + "geometry": [1.2, 0.0, 0.0] + } + ], + "bonds": [ + {"atoms": [0, 1], "order": 2} + ], + "properties": { + "molecularMass": 32.0, + "meltingPoint": -218.8, + "boilingPoint": -183.0 + } + } + ] +} diff --git a/Assets/script/Molecul.json.meta b/Assets/script/Molecul.json.meta new file mode 100644 index 0000000..b640aa5 --- /dev/null +++ b/Assets/script/Molecul.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3a11d0f923ae50c4d82ee1dda0f629a3 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/script/Molecules.cs b/Assets/script/Molecules.cs new file mode 100644 index 0000000..c2f09f9 --- /dev/null +++ b/Assets/script/Molecules.cs @@ -0,0 +1,25 @@ +[System.Serializable] +public class Molecule +{ + // nom molécules + public string name; + + // formule melécule + public string formula; + + // liste des atoms + public Atom[] atoms; + + // liste des liason entre les atoms + public Bond[] bonds; + + // prorpiété de la molécule + public Properties properties; +} + +[System.Serializable] +public class Molecules +{ + // liste des liason entre les atoms + public Molecule[] molecules; +} \ No newline at end of file diff --git a/Assets/script/Molecules.cs.meta b/Assets/script/Molecules.cs.meta new file mode 100644 index 0000000..55e339c --- /dev/null +++ b/Assets/script/Molecules.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 23d78ff2f0da0df4ba3f76aa522bfe4c +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/script/Properties.cs b/Assets/script/Properties.cs new file mode 100644 index 0000000..b8b0d18 --- /dev/null +++ b/Assets/script/Properties.cs @@ -0,0 +1,10 @@ +[System.Serializable] +public class Properties +{ + // masse en g/mol + public float molecularMass; + // température de fusion (solid->liquide) + public float meltingPoint; + // température d'évaporation (liquide-> gaz) + public float boilingPoint; +} \ No newline at end of file diff --git a/Assets/script/Properties.cs.meta b/Assets/script/Properties.cs.meta new file mode 100644 index 0000000..f47d50b --- /dev/null +++ b/Assets/script/Properties.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5df75892dfdcac7468e63229a5bd0ab8 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/script/ReadMolecule.cs b/Assets/script/ReadMolecule.cs new file mode 100644 index 0000000..e5a9c4e --- /dev/null +++ b/Assets/script/ReadMolecule.cs @@ -0,0 +1,23 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class ReadMolecule : MonoBehaviour +{ + public TextAsset jsonFile; + + void Start() + { + Molecules moleculesInJson = JsonUtility.FromJson(jsonFile.text); + + foreach (Molecule molecule in moleculesInJson.molecules){ + Debug.Log("Found molecules: " + molecule.name); + } + } + + // Update is called once per frame + void Update() + { + + } +} From 0c4b59e5777046e3182b22f809858143fd39d218 Mon Sep 17 00:00:00 2001 From: clement Date: Sat, 6 Jan 2024 15:51:30 +0100 Subject: [PATCH 2/9] sync tout --- .../RocketBooster.Body_scaled.jpg.meta | 13 +++++ .../RocketBooster.Top_scaled.jpg.meta | 13 +++++ .../emulator_ground_plane_scaled.jpg.meta | 13 +++++ .../Astronaut_scaled.jpg.meta | 13 +++++ .../VuforiaMars_Images/Drone_scaled.jpg.meta | 13 +++++ .../Fissure_scaled.jpg.meta | 13 +++++ .../MarsBox.Back_scaled.jpg.meta | 13 +++++ .../MarsBox.Bottom_scaled.jpg.meta | 13 +++++ .../MarsBox.Front_scaled.jpg.meta | 13 +++++ .../MarsBox.Left_scaled.jpg.meta | 13 +++++ .../MarsBox.Right_scaled.jpg.meta | 13 +++++ .../MarsBox.Top_scaled.jpg.meta | 13 +++++ .../VuforiaMars_Images/Oxygen_scaled.jpg.meta | 13 +++++ Assets/Scenes/MainMenu.unity | 48 ++++++++++++++++++- .../Settings/Open XR Package Settings.asset | 18 ++++++- Assets/script.meta | 8 ++++ Assets/script/HelloWorld.cs | 21 ++++++++ Assets/script/HelloWorld.cs.meta | 11 +++++ Assets/script/ReadMolecule.cs.meta | 11 +++++ ProjectSettings/EditorBuildSettings.asset | 5 +- QCAR/lh | 1 + QCAR/somedata16 | 1 + 22 files changed, 290 insertions(+), 3 deletions(-) create mode 100644 Assets/script.meta create mode 100644 Assets/script/HelloWorld.cs create mode 100644 Assets/script/HelloWorld.cs.meta create mode 100644 Assets/script/ReadMolecule.cs.meta create mode 100644 QCAR/lh create mode 100644 QCAR/somedata16 diff --git a/Assets/Editor/Vuforia/CylinderTargetTextures/VuforiaMars_Images/RocketBooster.Body_scaled.jpg.meta b/Assets/Editor/Vuforia/CylinderTargetTextures/VuforiaMars_Images/RocketBooster.Body_scaled.jpg.meta index c5d0f22..4130f74 100644 --- a/Assets/Editor/Vuforia/CylinderTargetTextures/VuforiaMars_Images/RocketBooster.Body_scaled.jpg.meta +++ b/Assets/Editor/Vuforia/CylinderTargetTextures/VuforiaMars_Images/RocketBooster.Body_scaled.jpg.meta @@ -158,6 +158,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 + - 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: 1 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Editor/Vuforia/CylinderTargetTextures/VuforiaMars_Images/RocketBooster.Top_scaled.jpg.meta b/Assets/Editor/Vuforia/CylinderTargetTextures/VuforiaMars_Images/RocketBooster.Top_scaled.jpg.meta index e7798c9..9cec1c2 100644 --- a/Assets/Editor/Vuforia/CylinderTargetTextures/VuforiaMars_Images/RocketBooster.Top_scaled.jpg.meta +++ b/Assets/Editor/Vuforia/CylinderTargetTextures/VuforiaMars_Images/RocketBooster.Top_scaled.jpg.meta @@ -158,6 +158,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 + - 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: 1 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaEmulator/emulator_ground_plane_scaled.jpg.meta b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaEmulator/emulator_ground_plane_scaled.jpg.meta index c0863c9..f99face 100644 --- a/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaEmulator/emulator_ground_plane_scaled.jpg.meta +++ b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaEmulator/emulator_ground_plane_scaled.jpg.meta @@ -158,6 +158,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 + - 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: 1 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/Astronaut_scaled.jpg.meta b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/Astronaut_scaled.jpg.meta index be1cb7e..a4df4bc 100644 --- a/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/Astronaut_scaled.jpg.meta +++ b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/Astronaut_scaled.jpg.meta @@ -158,6 +158,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 + - 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: 1 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/Drone_scaled.jpg.meta b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/Drone_scaled.jpg.meta index 5a3f851..55e81b9 100644 --- a/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/Drone_scaled.jpg.meta +++ b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/Drone_scaled.jpg.meta @@ -158,6 +158,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 + - 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: 1 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/Fissure_scaled.jpg.meta b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/Fissure_scaled.jpg.meta index 05a0fb0..4a9fe85 100644 --- a/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/Fissure_scaled.jpg.meta +++ b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/Fissure_scaled.jpg.meta @@ -158,6 +158,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 + - 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: 1 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/MarsBox.Back_scaled.jpg.meta b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/MarsBox.Back_scaled.jpg.meta index b088486..569d115 100644 --- a/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/MarsBox.Back_scaled.jpg.meta +++ b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/MarsBox.Back_scaled.jpg.meta @@ -158,6 +158,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 + - 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: 1 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/MarsBox.Bottom_scaled.jpg.meta b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/MarsBox.Bottom_scaled.jpg.meta index 0aa1d29..51bc96b 100644 --- a/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/MarsBox.Bottom_scaled.jpg.meta +++ b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/MarsBox.Bottom_scaled.jpg.meta @@ -158,6 +158,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 + - 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: 1 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/MarsBox.Front_scaled.jpg.meta b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/MarsBox.Front_scaled.jpg.meta index 889e297..8ca59ab 100644 --- a/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/MarsBox.Front_scaled.jpg.meta +++ b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/MarsBox.Front_scaled.jpg.meta @@ -158,6 +158,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 + - 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: 1 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/MarsBox.Left_scaled.jpg.meta b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/MarsBox.Left_scaled.jpg.meta index 79b71de..412d945 100644 --- a/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/MarsBox.Left_scaled.jpg.meta +++ b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/MarsBox.Left_scaled.jpg.meta @@ -158,6 +158,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 + - 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: 1 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/MarsBox.Right_scaled.jpg.meta b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/MarsBox.Right_scaled.jpg.meta index ead3c46..a5493bc 100644 --- a/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/MarsBox.Right_scaled.jpg.meta +++ b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/MarsBox.Right_scaled.jpg.meta @@ -158,6 +158,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 + - 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: 1 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/MarsBox.Top_scaled.jpg.meta b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/MarsBox.Top_scaled.jpg.meta index 52b27d9..57e6705 100644 --- a/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/MarsBox.Top_scaled.jpg.meta +++ b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/MarsBox.Top_scaled.jpg.meta @@ -158,6 +158,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 + - 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: 1 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/Oxygen_scaled.jpg.meta b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/Oxygen_scaled.jpg.meta index c02ab92..afb0a78 100644 --- a/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/Oxygen_scaled.jpg.meta +++ b/Assets/Editor/Vuforia/ImageTargetTextures/VuforiaMars_Images/Oxygen_scaled.jpg.meta @@ -158,6 +158,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 + - 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: 1 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index e75f0c7..7742fee 100644 --- 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: @@ -655,6 +655,51 @@ MonoBehaviour: m_EditorClassIdentifier: button: {fileID: 909516280} sceneToChange: 3 +--- !u!1 &799614600 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 799614602} + - component: {fileID: 799614603} + m_Layer: 0 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &799614602 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 799614600} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 3, z: 0} + 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!114 &799614603 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 799614600} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f13310aa5828a5d47b5e83a3e9eb3fec, type: 3} + m_Name: + m_EditorClassIdentifier: + jsonFile: {fileID: 4900000, guid: 3a11d0f923ae50c4d82ee1dda0f629a3, type: 3} --- !u!1 &909516278 GameObject: m_ObjectHideFlags: 0 @@ -1252,3 +1297,4 @@ SceneRoots: - {fileID: 693850230} - {fileID: 732397232} - {fileID: 534669306} + - {fileID: 799614602} diff --git a/Assets/XR/Settings/Open XR Package Settings.asset b/Assets/XR/Settings/Open XR Package Settings.asset index fb180d2..6c0c06e 100644 --- a/Assets/XR/Settings/Open XR Package Settings.asset +++ b/Assets/XR/Settings/Open XR Package Settings.asset @@ -20,6 +20,21 @@ MonoBehaviour: company: Unity priority: 0 required: 0 +--- !u!114 &-8388492336231509029 +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 &-7865320255151649905 MonoBehaviour: m_ObjectHideFlags: 0 @@ -406,10 +421,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9f0ebc320a151d3408ea1e9fce54d40e, type: 3} m_Name: Open XR Package Settings m_EditorClassIdentifier: - Keys: 0100000007000000 + Keys: 01000000070000000d000000 Values: - {fileID: -338175974121554628} - {fileID: -2565923732356543355} + - {fileID: -8388492336231509029} --- !u!114 &1420927166792567669 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/script.meta b/Assets/script.meta new file mode 100644 index 0000000..cb2a8f6 --- /dev/null +++ b/Assets/script.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7f609c39b51d9e447a6a4a5964011b44 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/script/HelloWorld.cs b/Assets/script/HelloWorld.cs new file mode 100644 index 0000000..eb4011e --- /dev/null +++ b/Assets/script/HelloWorld.cs @@ -0,0 +1,21 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Helloworld : MonoBehaviour +{ + // Start is called before the first frame update + void Start() { + Debug.Log("Hello World!"); + } + + public void hello() { + Debug.Log("Hello World!"); + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Assets/script/HelloWorld.cs.meta b/Assets/script/HelloWorld.cs.meta new file mode 100644 index 0000000..9d38325 --- /dev/null +++ b/Assets/script/HelloWorld.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: cdf92e9afe5b6ac4ab5f651b06dd4dc8 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/script/ReadMolecule.cs.meta b/Assets/script/ReadMolecule.cs.meta new file mode 100644 index 0000000..561ff69 --- /dev/null +++ b/Assets/script/ReadMolecule.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f13310aa5828a5d47b5e83a3e9eb3fec +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 7c92003..10f55f9 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -5,9 +5,12 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 m_Scenes: - - enabled: 1 + - enabled: 0 path: Assets/Scenes/MainMenu.unity guid: 432255403d6f571478f1043c2afa99d5 + - enabled: 1 + path: Assets/Scenes/CompositionMenu.unity + guid: 82704785f4b327f4fb004845f7dfd005 m_configObjects: Unity.XR.WindowsMR.Settings: {fileID: 11400000, guid: 744b813df90924c169af73489b8325de, type: 2} diff --git a/QCAR/lh b/QCAR/lh new file mode 100644 index 0000000..6a3d423 --- /dev/null +++ b/QCAR/lh @@ -0,0 +1 @@ +SYa2q["b %SxYe. \ No newline at end of file diff --git a/QCAR/somedata16 b/QCAR/somedata16 new file mode 100644 index 0000000..f6588cf --- /dev/null +++ b/QCAR/somedata16 @@ -0,0 +1 @@ +AAABmYLL8/oCWYDVnt66QIDwPq6z4DN6r3/58aZWC0zcxYa43TCnvCp9IGuXZLgAObCqIm1fhMsWLttc6QAE6obPbuzCjEssQlT41wW38sIVuVhmsw6vfjVsXAQG/GQOgamARLtOkhTKi309FNa+3akhJu9wuEv5jF3vfRbPBoeMCWZuk4Pr8aP7mPH8+10geWHoSWbxgsaEEgrE0yO2xoQwTy2XOmCzZytqk+moWXU7VBu+0//q+koDSnWbjOkEGUfRwMmBJIK9J5TDJrSf/QZYBcEx1daR47cicuXzCb81VtaSvU5VIb9anoX6fukOHe/nCAfsltXFn+4G24NKlejZ568= \ No newline at end of file From f1b3c7628c4555fdc2cf1d2c33119629c8f590d8 Mon Sep 17 00:00:00 2001 From: clement Date: Sat, 6 Jan 2024 16:29:29 +0100 Subject: [PATCH 3/9] add somme example --- Assets/script/Molecul.json | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/Assets/script/Molecul.json b/Assets/script/Molecul.json index 073d783..6734170 100644 --- a/Assets/script/Molecul.json +++ b/Assets/script/Molecul.json @@ -21,6 +21,42 @@ "meltingPoint": -218.8, "boilingPoint": -183.0 } + }, + { + "name": "Ozone", + "formula": "O3", + "atoms": [ + {"element": "O", "geometry": [0.0, 0.0, 0.0]}, + {"element": "O", "geometry": [0.7, 0.0, 0.0]}, + {"element": "O", "geometry": [1.4, 0.0, 0.0]} + ], + "bonds": [ + {"atoms": [0, 1], "order": 1}, + {"atoms": [1, 2], "order": 1} + ], + "properties": { + "molecularMass": 47.9982, + "meltingPoint": -192.5, + "boilingPoint": -110.0 + } + }, + { + "name": "Dioxyde de carbone", + "formula": "CO2", + "atoms": [ + {"element": "C", "geometry": [0.0, 0.0, 0.0]}, + {"element": "O", "geometry": [1.2, 0.0, 0.0]}, + {"element": "O", "geometry": [-1.2, 0.0, 0.0]} + ], + "bonds": [ + {"atoms": [0, 1], "order": 2}, + {"atoms": [0, 2], "order": 2} + ], + "properties": { + "molecularMass": 44.0095, + "meltingPoint": -56.6, + "boilingPoint": -78.5 + } } ] } From 4e63a46dc65830263fcd8812c7a824abce38b8c8 Mon Sep 17 00:00:00 2001 From: clement Date: Sat, 6 Jan 2024 18:41:15 +0100 Subject: [PATCH 4/9] add some mol and test --- Assets/script/C.mat | 83 ++++++++++++++++++++++++++ Assets/script/C.mat.meta | 8 +++ Assets/script/C.prefab | 107 ++++++++++++++++++++++++++++++++++ Assets/script/C.prefab.meta | 7 +++ Assets/script/Molecul.json | 36 ++++++++++++ Assets/script/O.mat | 83 ++++++++++++++++++++++++++ Assets/script/O.mat.meta | 8 +++ Assets/script/O.prefab | 107 ++++++++++++++++++++++++++++++++++ Assets/script/O.prefab.meta | 7 +++ Assets/script/ReadMolecule.cs | 14 ++++- 10 files changed, 459 insertions(+), 1 deletion(-) create mode 100644 Assets/script/C.mat create mode 100644 Assets/script/C.mat.meta create mode 100644 Assets/script/C.prefab create mode 100644 Assets/script/C.prefab.meta create mode 100644 Assets/script/O.mat create mode 100644 Assets/script/O.mat.meta create mode 100644 Assets/script/O.prefab create mode 100644 Assets/script/O.prefab.meta diff --git a/Assets/script/C.mat b/Assets/script/C.mat new file mode 100644 index 0000000..e37d901 --- /dev/null +++ b/Assets/script/C.mat @@ -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: C + 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: [] diff --git a/Assets/script/C.mat.meta b/Assets/script/C.mat.meta new file mode 100644 index 0000000..cc15fef --- /dev/null +++ b/Assets/script/C.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f10c53e0b614bf3419e18d3d0921033e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/script/C.prefab b/Assets/script/C.prefab new file mode 100644 index 0000000..5e5d7d9 --- /dev/null +++ b/Assets/script/C.prefab @@ -0,0 +1,107 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &236738444019946666 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7653209704588422778} + - component: {fileID: 4796479721844232600} + - component: {fileID: 3412732257531849991} + - component: {fileID: 7332698231997700096} + m_Layer: 0 + m_Name: C + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7653209704588422778 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 236738444019946666} + 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: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &4796479721844232600 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 236738444019946666} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &3412732257531849991 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 236738444019946666} + 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: f10c53e0b614bf3419e18d3d0921033e, 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!135 &7332698231997700096 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 236738444019946666} + 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_Radius: 0.5 + m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/script/C.prefab.meta b/Assets/script/C.prefab.meta new file mode 100644 index 0000000..47b9eaa --- /dev/null +++ b/Assets/script/C.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c031a3ea596b6c14abd0a9cf9b5e8837 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/script/Molecul.json b/Assets/script/Molecul.json index 6734170..f08188d 100644 --- a/Assets/script/Molecul.json +++ b/Assets/script/Molecul.json @@ -57,6 +57,42 @@ "meltingPoint": -56.6, "boilingPoint": -78.5 } + }, + { + "name": "Butane", + "formula": "C4H10", + "atoms": [ + {"element": "C", "geometry": [0.0, 0.0, 0.0]}, + {"element": "C", "geometry": [1.5, 0.0, 0.0]}, + {"element": "C", "geometry": [3.0, 0.0, 0.0]}, + {"element": "C", "geometry": [4.5, 0.0, 0.0]}, + {"element": "H", "geometry": [0.0, 1.5, 0.0]}, + {"element": "H", "geometry": [0.0, -1.5, 0.0]}, + {"element": "H", "geometry": [1.5, 1.5, 0.0]}, + {"element": "H", "geometry": [1.5, -1.5, 0.0]}, + {"element": "H", "geometry": [3.0, 1.5, 0.0]}, + {"element": "H", "geometry": [3.0, -1.5, 0.0]}, + {"element": "H", "geometry": [4.5, 1.5, 0.0]}, + {"element": "H", "geometry": [4.5, -1.5, 0.0]} + ], + "bonds": [ + {"atoms": [0, 1], "order": 1}, + {"atoms": [1, 2], "order": 1}, + {"atoms": [2, 3], "order": 1}, + {"atoms": [0, 4], "order": 1}, + {"atoms": [0, 5], "order": 1}, + {"atoms": [1, 6], "order": 1}, + {"atoms": [1, 7], "order": 1}, + {"atoms": [2, 8], "order": 1}, + {"atoms": [2, 9], "order": 1}, + {"atoms": [3, 10], "order": 1}, + {"atoms": [3, 11], "order": 1} + ], + "properties": { + "molecularMass": 58.1222, + "meltingPoint": -138.3, + "boilingPoint": -0.5 + } } ] } diff --git a/Assets/script/O.mat b/Assets/script/O.mat new file mode 100644 index 0000000..a8be275 --- /dev/null +++ b/Assets/script/O.mat @@ -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: O + 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: [] diff --git a/Assets/script/O.mat.meta b/Assets/script/O.mat.meta new file mode 100644 index 0000000..4d8c6f7 --- /dev/null +++ b/Assets/script/O.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 89559d198361d2e4eafdd7d43f1f13b4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/script/O.prefab b/Assets/script/O.prefab new file mode 100644 index 0000000..319cc52 --- /dev/null +++ b/Assets/script/O.prefab @@ -0,0 +1,107 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3655036399522394151 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8552605844169481804} + - component: {fileID: 7279700880585589614} + - component: {fileID: 6020019663108605823} + - component: {fileID: 2894034080411657905} + m_Layer: 0 + m_Name: O + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8552605844169481804 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3655036399522394151} + 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: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &7279700880585589614 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3655036399522394151} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &6020019663108605823 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3655036399522394151} + 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: 89559d198361d2e4eafdd7d43f1f13b4, 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!135 &2894034080411657905 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3655036399522394151} + 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_Radius: 0.5 + m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/script/O.prefab.meta b/Assets/script/O.prefab.meta new file mode 100644 index 0000000..95596b5 --- /dev/null +++ b/Assets/script/O.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 027c97d1954e2a44db92464acd35fde9 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/script/ReadMolecule.cs b/Assets/script/ReadMolecule.cs index e5a9c4e..3201aff 100644 --- a/Assets/script/ReadMolecule.cs +++ b/Assets/script/ReadMolecule.cs @@ -10,8 +10,20 @@ public class ReadMolecule : MonoBehaviour { Molecules moleculesInJson = JsonUtility.FromJson(jsonFile.text); + int molNum = 0; + int dist = 5; foreach (Molecule molecule in moleculesInJson.molecules){ - Debug.Log("Found molecules: " + molecule.name); + + GameObject moleculeObj = new GameObject(molecule.name); + + foreach (Atom atom in molecule.atoms){ + GameObject sphere = GameObject.CreatePrimitive(PrimitiveType.Sphere); + sphere.transform.parent = moleculeObj.transform; + sphere.name = atom.element; + sphere.transform.localPosition = new Vector3(atom.geometry[0], atom.geometry[1], atom.geometry[2]); + } + moleculeObj.transform.position = new Vector3(molNum*dist,0,0); + molNum++; } } From 7c3aa27c71df7571a804da8cc01d53c73b5ce7cb Mon Sep 17 00:00:00 2001 From: clement Date: Thu, 11 Jan 2024 16:38:19 +0100 Subject: [PATCH 5/9] sync --- Assets/Scenes/MainMenu.unity | 170 +++++++++++++++++++- Assets/script/C.mat | 2 +- Assets/script/MoleculeDict.json | 98 +++++++++++ Assets/script/MoleculeDict.json.meta | 7 + Assets/script/MoleculeFactory.cs | 59 +++++++ Assets/script/MoleculeFactory.cs.meta | 11 ++ Assets/script/MoleculeFactoryTester.cs | 17 ++ Assets/script/MoleculeFactoryTester.cs.meta | 11 ++ Assets/script/Molecules.cs | 7 +- Assets/script/ReadMolecule.cs | 3 +- 10 files changed, 375 insertions(+), 10 deletions(-) create mode 100644 Assets/script/MoleculeDict.json create mode 100644 Assets/script/MoleculeDict.json.meta create mode 100644 Assets/script/MoleculeFactory.cs create mode 100644 Assets/script/MoleculeFactory.cs.meta create mode 100644 Assets/script/MoleculeFactoryTester.cs create mode 100644 Assets/script/MoleculeFactoryTester.cs.meta diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index 7742fee..2c0de18 100644 --- a/Assets/Scenes/MainMenu.unity +++ b/Assets/Scenes/MainMenu.unity @@ -332,6 +332,148 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 136169417} m_CullTransparentMesh: 1 +--- !u!1001 &183054814 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 799614602} + m_Modifications: + - target: {fileID: 236738444019946666, guid: c031a3ea596b6c14abd0a9cf9b5e8837, + type: 3} + propertyPath: m_Name + value: C + objectReference: {fileID: 0} + - target: {fileID: 7653209704588422778, guid: c031a3ea596b6c14abd0a9cf9b5e8837, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7653209704588422778, guid: c031a3ea596b6c14abd0a9cf9b5e8837, + type: 3} + propertyPath: m_LocalPosition.y + value: -3 + objectReference: {fileID: 0} + - target: {fileID: 7653209704588422778, guid: c031a3ea596b6c14abd0a9cf9b5e8837, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7653209704588422778, guid: c031a3ea596b6c14abd0a9cf9b5e8837, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7653209704588422778, guid: c031a3ea596b6c14abd0a9cf9b5e8837, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7653209704588422778, guid: c031a3ea596b6c14abd0a9cf9b5e8837, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7653209704588422778, guid: c031a3ea596b6c14abd0a9cf9b5e8837, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7653209704588422778, guid: c031a3ea596b6c14abd0a9cf9b5e8837, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7653209704588422778, guid: c031a3ea596b6c14abd0a9cf9b5e8837, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7653209704588422778, guid: c031a3ea596b6c14abd0a9cf9b5e8837, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c031a3ea596b6c14abd0a9cf9b5e8837, type: 3} +--- !u!1001 &508073240 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 799614602} + m_Modifications: + - target: {fileID: 3655036399522394151, guid: 027c97d1954e2a44db92464acd35fde9, + type: 3} + propertyPath: m_Name + value: O + objectReference: {fileID: 0} + - target: {fileID: 8552605844169481804, guid: 027c97d1954e2a44db92464acd35fde9, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8552605844169481804, guid: 027c97d1954e2a44db92464acd35fde9, + type: 3} + propertyPath: m_LocalPosition.y + value: -3 + objectReference: {fileID: 0} + - target: {fileID: 8552605844169481804, guid: 027c97d1954e2a44db92464acd35fde9, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8552605844169481804, guid: 027c97d1954e2a44db92464acd35fde9, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8552605844169481804, guid: 027c97d1954e2a44db92464acd35fde9, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8552605844169481804, guid: 027c97d1954e2a44db92464acd35fde9, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8552605844169481804, guid: 027c97d1954e2a44db92464acd35fde9, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8552605844169481804, guid: 027c97d1954e2a44db92464acd35fde9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8552605844169481804, guid: 027c97d1954e2a44db92464acd35fde9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8552605844169481804, guid: 027c97d1954e2a44db92464acd35fde9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 027c97d1954e2a44db92464acd35fde9, type: 3} +--- !u!4 &529523028 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8552605844169481804, guid: 027c97d1954e2a44db92464acd35fde9, + type: 3} + m_PrefabInstance: {fileID: 508073240} + m_PrefabAsset: {fileID: 0} --- !u!1 &534669303 GameObject: m_ObjectHideFlags: 0 @@ -400,6 +542,12 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &678364522 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7653209704588422778, guid: c031a3ea596b6c14abd0a9cf9b5e8837, + type: 3} + m_PrefabInstance: {fileID: 183054814} + m_PrefabAsset: {fileID: 0} --- !u!1 &693850225 GameObject: m_ObjectHideFlags: 0 @@ -665,8 +813,9 @@ GameObject: m_Component: - component: {fileID: 799614602} - component: {fileID: 799614603} + - component: {fileID: 799614604} m_Layer: 0 - m_Name: GameObject + m_Name: Molecule parcer m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -684,7 +833,9 @@ Transform: m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 678364522} + - {fileID: 529523028} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &799614603 @@ -694,12 +845,25 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 799614600} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f13310aa5828a5d47b5e83a3e9eb3fec, type: 3} m_Name: m_EditorClassIdentifier: jsonFile: {fileID: 4900000, guid: 3a11d0f923ae50c4d82ee1dda0f629a3, type: 3} +--- !u!114 &799614604 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 799614600} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 617b4ba049dacfb4da7aa525641f8371, type: 3} + m_Name: + m_EditorClassIdentifier: + jsonFile: {fileID: 4900000, guid: 865ef6336b8f164428ff661758efffd1, type: 3} --- !u!1 &909516278 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/script/C.mat b/Assets/script/C.mat index e37d901..4058690 100644 --- a/Assets/script/C.mat +++ b/Assets/script/C.mat @@ -78,6 +78,6 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 1, g: 0, b: 0, a: 1} + - _Color: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/script/MoleculeDict.json b/Assets/script/MoleculeDict.json new file mode 100644 index 0000000..112654c --- /dev/null +++ b/Assets/script/MoleculeDict.json @@ -0,0 +1,98 @@ +{ + "molecules": { + "O2": { + "name": "Dioxygène", + "formula": "O2", + "atoms": [ + { + "element": "O", + "geometry": [0.0, 0.0, 0.0] + }, + { + "element": "O", + "geometry": [1.2, 0.0, 0.0] + } + ], + "bonds": [ + {"atoms": [0, 1], "order": 2} + ], + "properties": { + "molecularMass": 32.0, + "meltingPoint": -218.8, + "boilingPoint": -183.0 + } + }, + "O3": { + "name": "Ozone", + "formula": "O3", + "atoms": [ + {"element": "O", "geometry": [0.0, 0.0, 0.0]}, + {"element": "O", "geometry": [0.7, 0.0, 0.0]}, + {"element": "O", "geometry": [1.4, 0.0, 0.0]} + ], + "bonds": [ + {"atoms": [0, 1], "order": 1}, + {"atoms": [1, 2], "order": 1} + ], + "properties": { + "molecularMass": 47.9982, + "meltingPoint": -192.5, + "boilingPoint": -110.0 + } + }, + "CO2": { + "name": "Dioxyde de carbone", + "formula": "CO2", + "atoms": [ + {"element": "C", "geometry": [0.0, 0.0, 0.0]}, + {"element": "O", "geometry": [1.2, 0.0, 0.0]}, + {"element": "O", "geometry": [-1.2, 0.0, 0.0]} + ], + "bonds": [ + {"atoms": [0, 1], "order": 2}, + {"atoms": [0, 2], "order": 2} + ], + "properties": { + "molecularMass": 44.0095, + "meltingPoint": -56.6, + "boilingPoint": -78.5 + } + }, + "C4H10": { + "name": "Butane", + "formula": "C4H10", + "atoms": [ + {"element": "C", "geometry": [0.0, 0.0, 0.0]}, + {"element": "C", "geometry": [1.5, 0.0, 0.0]}, + {"element": "C", "geometry": [3.0, 0.0, 0.0]}, + {"element": "C", "geometry": [4.5, 0.0, 0.0]}, + {"element": "H", "geometry": [0.0, 1.5, 0.0]}, + {"element": "H", "geometry": [0.0, -1.5, 0.0]}, + {"element": "H", "geometry": [1.5, 1.5, 0.0]}, + {"element": "H", "geometry": [1.5, -1.5, 0.0]}, + {"element": "H", "geometry": [3.0, 1.5, 0.0]}, + {"element": "H", "geometry": [3.0, -1.5, 0.0]}, + {"element": "H", "geometry": [4.5, 1.5, 0.0]}, + {"element": "H", "geometry": [4.5, -1.5, 0.0]} + ], + "bonds": [ + {"atoms": [0, 1], "order": 1}, + {"atoms": [1, 2], "order": 1}, + {"atoms": [2, 3], "order": 1}, + {"atoms": [0, 4], "order": 1}, + {"atoms": [0, 5], "order": 1}, + {"atoms": [1, 6], "order": 1}, + {"atoms": [1, 7], "order": 1}, + {"atoms": [2, 8], "order": 1}, + {"atoms": [2, 9], "order": 1}, + {"atoms": [3, 10], "order": 1}, + {"atoms": [3, 11], "order": 1} + ], + "properties": { + "molecularMass": 58.1222, + "meltingPoint": -138.3, + "boilingPoint": -0.5 + } + } + } +} diff --git a/Assets/script/MoleculeDict.json.meta b/Assets/script/MoleculeDict.json.meta new file mode 100644 index 0000000..3f76a01 --- /dev/null +++ b/Assets/script/MoleculeDict.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 865ef6336b8f164428ff661758efffd1 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/script/MoleculeFactory.cs b/Assets/script/MoleculeFactory.cs new file mode 100644 index 0000000..71aec46 --- /dev/null +++ b/Assets/script/MoleculeFactory.cs @@ -0,0 +1,59 @@ +using System; +using System.Collections.Generic; +using UnityEngine; + + + +public class MoleculeFactory : MonoBehaviour{ + + public TextAsset jsonFile; + + private static MoleculeFactory instance; + + private Molecules moleculesInJson; + + private Dictionary moleculesDictionary; + + public MoleculeFactory(TextAsset jsonFile){ + MoleculeFactory.instance = this; + moleculesInJson = JsonUtility.FromJson>(jsonFile.text); + Debug.Log(jsonFile.text); + moleculesDictionary = BuildMoleculesDictionary(moleculesInJson); + + } + + public static MoleculeFactory getInstrance(){ + if(MoleculeFactory.instance == null){ + Debug.LogError("no Json file"); + } + return MoleculeFactory.instance; + } + + public static MoleculeFactory getInstrance(TextAsset jsonFile){ + if(MoleculeFactory.instance == null){ + MoleculeFactory.instance = new MoleculeFactory(jsonFile); + } + return MoleculeFactory.instance; + } + + 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); + } + + // Debug.Log(molecule); + + // make your shit + + //return GO + return null; + } + +} \ No newline at end of file diff --git a/Assets/script/MoleculeFactory.cs.meta b/Assets/script/MoleculeFactory.cs.meta new file mode 100644 index 0000000..9d48356 --- /dev/null +++ b/Assets/script/MoleculeFactory.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 68834abede8b8d14d93f46876f40df3e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/script/MoleculeFactoryTester.cs b/Assets/script/MoleculeFactoryTester.cs new file mode 100644 index 0000000..c768e72 --- /dev/null +++ b/Assets/script/MoleculeFactoryTester.cs @@ -0,0 +1,17 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + + + + +class MoleculeFactoryTester: MonoBehaviour { + + public TextAsset jsonFile; + + void Start(){ + MoleculeFactory factory = MoleculeFactory.getInstrance(this.jsonFile); + GameObject mol = factory.createMolecule("O2"); +// mol.transform.position = new Vector3(10,0,0); + } +} \ No newline at end of file diff --git a/Assets/script/MoleculeFactoryTester.cs.meta b/Assets/script/MoleculeFactoryTester.cs.meta new file mode 100644 index 0000000..b3c85b3 --- /dev/null +++ b/Assets/script/MoleculeFactoryTester.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 617b4ba049dacfb4da7aa525641f8371 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/script/Molecules.cs b/Assets/script/Molecules.cs index c2f09f9..7e4d19b 100644 --- a/Assets/script/Molecules.cs +++ b/Assets/script/Molecules.cs @@ -1,12 +1,11 @@ +using System.Collections.Generic; +using System; [System.Serializable] public class Molecule { // nom molécules public string name; - // formule melécule - public string formula; - // liste des atoms public Atom[] atoms; @@ -21,5 +20,5 @@ public class Molecule public class Molecules { // liste des liason entre les atoms - public Molecule[] molecules; + public Dictionary molecules; } \ No newline at end of file diff --git a/Assets/script/ReadMolecule.cs b/Assets/script/ReadMolecule.cs index 3201aff..728fb39 100644 --- a/Assets/script/ReadMolecule.cs +++ b/Assets/script/ReadMolecule.cs @@ -6,8 +6,7 @@ public class ReadMolecule : MonoBehaviour { public TextAsset jsonFile; - void Start() - { + void Start(){ Molecules moleculesInJson = JsonUtility.FromJson(jsonFile.text); int molNum = 0; From 33e34e9fde556dfc166907bce350e4b9b0867317 Mon Sep 17 00:00:00 2001 From: clement Date: Thu, 11 Jan 2024 16:53:06 +0100 Subject: [PATCH 6/9] 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>(jsonFile.text); - Debug.Log(jsonFile.text); - moleculesDictionary = BuildMoleculesDictionary(moleculesInJson); - + moleculesDictionary = new Dictionary(); + moleculesInJson = JsonUtility.FromJson(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 molecules; + public Molecule[] molecules; } \ No newline at end of file From e12fed048949652afb389d2ce97acbcf2e2e7037 Mon Sep 17 00:00:00 2001 From: clement Date: Thu, 11 Jan 2024 17:11:59 +0100 Subject: [PATCH 7/9] normalent on est quasi bon --- Assets/script/MoleculeFactory.cs | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/Assets/script/MoleculeFactory.cs b/Assets/script/MoleculeFactory.cs index 8f56ee1..4a32dd4 100644 --- a/Assets/script/MoleculeFactory.cs +++ b/Assets/script/MoleculeFactory.cs @@ -42,11 +42,17 @@ public class MoleculeFactory : MonoBehaviour{ Debug.LogError("molecules does not existe in json") } Molecule molecule = moleculesDictionary[formula]; - - Debug.Log(molecule); - - //return GO - return null; + GameObject sortie = new GameObject(molecule.name); + + foreach (Atom atom in molecule.atoms) { + 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]); + //TODO: géré la taille de l'atome + //TODO: géré la couleur de l'atome + } + return sortie; } } \ No newline at end of file From 74a69cf8f7c4d747cac5db763be6aca313c2e822 Mon Sep 17 00:00:00 2001 From: clement Date: Thu, 11 Jan 2024 17:16:12 +0100 Subject: [PATCH 8/9] add todo --- Assets/script/MoleculeFactory.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Assets/script/MoleculeFactory.cs b/Assets/script/MoleculeFactory.cs index 4a32dd4..3607df5 100644 --- a/Assets/script/MoleculeFactory.cs +++ b/Assets/script/MoleculeFactory.cs @@ -39,16 +39,17 @@ public class MoleculeFactory : MonoBehaviour{ public GameObject createMolecule (string formula){ if(!moleculesDictionary.ContainsKey(formula)){ - Debug.LogError("molecules does not existe in json") + Debug.LogError("molecules does not existe in json"); } Molecule molecule = moleculesDictionary[formula]; GameObject sortie = new GameObject(molecule.name); foreach (Atom atom in molecule.atoms) { - GameObject Sphere = GameObject.CreatePrimitive(PrimitiveType.Sphere); + 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]); + //TODO: géré les laision //TODO: géré la taille de l'atome //TODO: géré la couleur de l'atome } From 118a6693715f95125e710ee292fb78b3ec1f9b3b Mon Sep 17 00:00:00 2001 From: clement Date: Fri, 12 Jan 2024 10:20:31 +0100 Subject: [PATCH 9/9] cleanup code --- Assets/script/C.mat | 83 --------------- Assets/script/C.mat.meta | 8 -- Assets/script/C.prefab | 107 -------------------- Assets/script/C.prefab.meta | 7 -- Assets/script/HelloWorld.cs | 21 ---- Assets/script/HelloWorld.cs.meta | 11 -- Assets/script/MoleculeDict.json | 98 ------------------ Assets/script/MoleculeDict.json.meta | 7 -- Assets/script/MoleculeFactoryTester.cs | 17 ---- Assets/script/MoleculeFactoryTester.cs.meta | 11 -- Assets/script/O.mat | 83 --------------- Assets/script/O.mat.meta | 8 -- Assets/script/O.prefab | 107 -------------------- Assets/script/O.prefab.meta | 7 -- 14 files changed, 575 deletions(-) delete mode 100644 Assets/script/C.mat delete mode 100644 Assets/script/C.mat.meta delete mode 100644 Assets/script/C.prefab delete mode 100644 Assets/script/C.prefab.meta delete mode 100644 Assets/script/HelloWorld.cs delete mode 100644 Assets/script/HelloWorld.cs.meta delete mode 100644 Assets/script/MoleculeDict.json delete mode 100644 Assets/script/MoleculeDict.json.meta delete mode 100644 Assets/script/MoleculeFactoryTester.cs delete mode 100644 Assets/script/MoleculeFactoryTester.cs.meta delete mode 100644 Assets/script/O.mat delete mode 100644 Assets/script/O.mat.meta delete mode 100644 Assets/script/O.prefab delete mode 100644 Assets/script/O.prefab.meta diff --git a/Assets/script/C.mat b/Assets/script/C.mat deleted file mode 100644 index 4058690..0000000 --- a/Assets/script/C.mat +++ /dev/null @@ -1,83 +0,0 @@ -%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: C - 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: 0, b: 0, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/script/C.mat.meta b/Assets/script/C.mat.meta deleted file mode 100644 index cc15fef..0000000 --- a/Assets/script/C.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f10c53e0b614bf3419e18d3d0921033e -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/script/C.prefab b/Assets/script/C.prefab deleted file mode 100644 index 5e5d7d9..0000000 --- a/Assets/script/C.prefab +++ /dev/null @@ -1,107 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &236738444019946666 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7653209704588422778} - - component: {fileID: 4796479721844232600} - - component: {fileID: 3412732257531849991} - - component: {fileID: 7332698231997700096} - m_Layer: 0 - m_Name: C - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7653209704588422778 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 236738444019946666} - 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: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &4796479721844232600 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 236738444019946666} - m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &3412732257531849991 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 236738444019946666} - 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: f10c53e0b614bf3419e18d3d0921033e, 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!135 &7332698231997700096 -SphereCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 236738444019946666} - 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_Radius: 0.5 - m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/script/C.prefab.meta b/Assets/script/C.prefab.meta deleted file mode 100644 index 47b9eaa..0000000 --- a/Assets/script/C.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: c031a3ea596b6c14abd0a9cf9b5e8837 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/script/HelloWorld.cs b/Assets/script/HelloWorld.cs deleted file mode 100644 index eb4011e..0000000 --- a/Assets/script/HelloWorld.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class Helloworld : MonoBehaviour -{ - // Start is called before the first frame update - void Start() { - Debug.Log("Hello World!"); - } - - public void hello() { - Debug.Log("Hello World!"); - } - - // Update is called once per frame - void Update() - { - - } -} diff --git a/Assets/script/HelloWorld.cs.meta b/Assets/script/HelloWorld.cs.meta deleted file mode 100644 index 9d38325..0000000 --- a/Assets/script/HelloWorld.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: cdf92e9afe5b6ac4ab5f651b06dd4dc8 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/script/MoleculeDict.json b/Assets/script/MoleculeDict.json deleted file mode 100644 index 112654c..0000000 --- a/Assets/script/MoleculeDict.json +++ /dev/null @@ -1,98 +0,0 @@ -{ - "molecules": { - "O2": { - "name": "Dioxygène", - "formula": "O2", - "atoms": [ - { - "element": "O", - "geometry": [0.0, 0.0, 0.0] - }, - { - "element": "O", - "geometry": [1.2, 0.0, 0.0] - } - ], - "bonds": [ - {"atoms": [0, 1], "order": 2} - ], - "properties": { - "molecularMass": 32.0, - "meltingPoint": -218.8, - "boilingPoint": -183.0 - } - }, - "O3": { - "name": "Ozone", - "formula": "O3", - "atoms": [ - {"element": "O", "geometry": [0.0, 0.0, 0.0]}, - {"element": "O", "geometry": [0.7, 0.0, 0.0]}, - {"element": "O", "geometry": [1.4, 0.0, 0.0]} - ], - "bonds": [ - {"atoms": [0, 1], "order": 1}, - {"atoms": [1, 2], "order": 1} - ], - "properties": { - "molecularMass": 47.9982, - "meltingPoint": -192.5, - "boilingPoint": -110.0 - } - }, - "CO2": { - "name": "Dioxyde de carbone", - "formula": "CO2", - "atoms": [ - {"element": "C", "geometry": [0.0, 0.0, 0.0]}, - {"element": "O", "geometry": [1.2, 0.0, 0.0]}, - {"element": "O", "geometry": [-1.2, 0.0, 0.0]} - ], - "bonds": [ - {"atoms": [0, 1], "order": 2}, - {"atoms": [0, 2], "order": 2} - ], - "properties": { - "molecularMass": 44.0095, - "meltingPoint": -56.6, - "boilingPoint": -78.5 - } - }, - "C4H10": { - "name": "Butane", - "formula": "C4H10", - "atoms": [ - {"element": "C", "geometry": [0.0, 0.0, 0.0]}, - {"element": "C", "geometry": [1.5, 0.0, 0.0]}, - {"element": "C", "geometry": [3.0, 0.0, 0.0]}, - {"element": "C", "geometry": [4.5, 0.0, 0.0]}, - {"element": "H", "geometry": [0.0, 1.5, 0.0]}, - {"element": "H", "geometry": [0.0, -1.5, 0.0]}, - {"element": "H", "geometry": [1.5, 1.5, 0.0]}, - {"element": "H", "geometry": [1.5, -1.5, 0.0]}, - {"element": "H", "geometry": [3.0, 1.5, 0.0]}, - {"element": "H", "geometry": [3.0, -1.5, 0.0]}, - {"element": "H", "geometry": [4.5, 1.5, 0.0]}, - {"element": "H", "geometry": [4.5, -1.5, 0.0]} - ], - "bonds": [ - {"atoms": [0, 1], "order": 1}, - {"atoms": [1, 2], "order": 1}, - {"atoms": [2, 3], "order": 1}, - {"atoms": [0, 4], "order": 1}, - {"atoms": [0, 5], "order": 1}, - {"atoms": [1, 6], "order": 1}, - {"atoms": [1, 7], "order": 1}, - {"atoms": [2, 8], "order": 1}, - {"atoms": [2, 9], "order": 1}, - {"atoms": [3, 10], "order": 1}, - {"atoms": [3, 11], "order": 1} - ], - "properties": { - "molecularMass": 58.1222, - "meltingPoint": -138.3, - "boilingPoint": -0.5 - } - } - } -} diff --git a/Assets/script/MoleculeDict.json.meta b/Assets/script/MoleculeDict.json.meta deleted file mode 100644 index 3f76a01..0000000 --- a/Assets/script/MoleculeDict.json.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 865ef6336b8f164428ff661758efffd1 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/script/MoleculeFactoryTester.cs b/Assets/script/MoleculeFactoryTester.cs deleted file mode 100644 index c768e72..0000000 --- a/Assets/script/MoleculeFactoryTester.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - - - - -class MoleculeFactoryTester: MonoBehaviour { - - public TextAsset jsonFile; - - void Start(){ - MoleculeFactory factory = MoleculeFactory.getInstrance(this.jsonFile); - GameObject mol = factory.createMolecule("O2"); -// mol.transform.position = new Vector3(10,0,0); - } -} \ No newline at end of file diff --git a/Assets/script/MoleculeFactoryTester.cs.meta b/Assets/script/MoleculeFactoryTester.cs.meta deleted file mode 100644 index b3c85b3..0000000 --- a/Assets/script/MoleculeFactoryTester.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 617b4ba049dacfb4da7aa525641f8371 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/script/O.mat b/Assets/script/O.mat deleted file mode 100644 index a8be275..0000000 --- a/Assets/script/O.mat +++ /dev/null @@ -1,83 +0,0 @@ -%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: O - 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: [] diff --git a/Assets/script/O.mat.meta b/Assets/script/O.mat.meta deleted file mode 100644 index 4d8c6f7..0000000 --- a/Assets/script/O.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 89559d198361d2e4eafdd7d43f1f13b4 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/script/O.prefab b/Assets/script/O.prefab deleted file mode 100644 index 319cc52..0000000 --- a/Assets/script/O.prefab +++ /dev/null @@ -1,107 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &3655036399522394151 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8552605844169481804} - - component: {fileID: 7279700880585589614} - - component: {fileID: 6020019663108605823} - - component: {fileID: 2894034080411657905} - m_Layer: 0 - m_Name: O - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8552605844169481804 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3655036399522394151} - 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: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &7279700880585589614 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3655036399522394151} - m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &6020019663108605823 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3655036399522394151} - 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: 89559d198361d2e4eafdd7d43f1f13b4, 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!135 &2894034080411657905 -SphereCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3655036399522394151} - 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_Radius: 0.5 - m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/script/O.prefab.meta b/Assets/script/O.prefab.meta deleted file mode 100644 index 95596b5..0000000 --- a/Assets/script/O.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 027c97d1954e2a44db92464acd35fde9 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: