Merge remote-tracking branch 'origin/develop' into feat/Molecule-json

cleanup code
add todo
2024-01-12 10:48:01 +01:00 · 2024-01-12 10:20:31 +01:00 · 2024-01-11 17:16:12 +01:00 · 2024-01-11 17:11:59 +01:00 · 2024-01-11 16:53:06 +01:00 · 2024-01-11 16:38:19 +01:00
91 changed files with 7639 additions and 952 deletions
--- a/Assets/Editor/Migration.meta
+++ b/Assets/Editor/Migration.meta
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 784c1ed2aa16453488a41efb0eeae8ce
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Plugins.meta
+++ b/Assets/Plugins.meta
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 4852efb0820681a48975763ec73cb00f
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Plugins/TextMesh
+++ b/Assets/Plugins/TextMesh
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: f54d1bd14bd3ca042bd867b519fee8cc
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Plugins/TextMesh
+++ b/Assets/Plugins/TextMesh
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 8e7e8f5a82a3a134e91c54efd2274ea9
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Pro/Documentation/TextMesh
+++ b/Pro/Documentation/TextMesh
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 1b8d251f9af63b746bf2f7ffe00ebb9b
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Plugins/TextMesh
+++ b/Assets/Plugins/TextMesh
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 6ab70aee4d56447429c680537fbf93ed
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Pro/Fonts/LiberationSans
+++ b/Pro/Fonts/LiberationSans
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 6e59c59b81ab47f9b6ec5781fa725d2c
-timeCreated: 1484171296
-licenseType: Pro
-TextScriptImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Pro/Fonts/LiberationSans.ttf.meta
+++ b/Pro/Fonts/LiberationSans.ttf.meta
@ -1,19 +0,0 @@
-fileFormatVersion: 2
-guid: e3265ab4bf004d28a9537516768c1c75
-timeCreated: 1484171297
-licenseType: Pro
-TrueTypeFontImporter:
-  serializedVersion: 2
-  fontSize: 16
-  forceTextureCase: -2
-  characterSpacing: 1
-  characterPadding: 0
-  includeFontData: 1
-  use2xBehaviour: 0
-  fontNames: []
-  fallbackFontReferences: []
-  customCharacters: 
-  fontRenderingMode: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Plugins/TextMesh
+++ b/Assets/Plugins/TextMesh
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 243e06394e614e5d99fab26083b707fa
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Plugins/TextMesh
+++ b/Assets/Plugins/TextMesh
@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 731f1baa9d144a9897cb1d341c2092b8
-folderAsset: yes
-timeCreated: 1442040525
-licenseType: Pro
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Materials/LiberationSans
+++ b/Materials/LiberationSans
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: e73a58f6e2794ae7b1b7e50b7fb811b0
-timeCreated: 1484172806
-licenseType: Pro
-NativeFormatImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Materials/LiberationSans
+++ b/Materials/LiberationSans
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 2e498d1c8094910479dc3e1b768306a4
-timeCreated: 1484171803
-licenseType: Pro
-NativeFormatImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Materials/LiberationSans
+++ b/Materials/LiberationSans
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 79459efec17a4d00a321bdcc27bbc385
-timeCreated: 1484172856
-licenseType: Pro
-NativeFormatImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Materials/LiberationSans
+++ b/Materials/LiberationSans
--- a/Materials/LiberationSans
+++ b/Materials/LiberationSans
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 8f586378b4e144a9851e7b34d9b748ee
-timeCreated: 1484171803
-licenseType: Pro
-NativeFormatImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Pro/Resources/LineBreaking
+++ b/Pro/Resources/LineBreaking
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: fade42e8bc714b018fac513c043d323b
-timeCreated: 1425440388
-licenseType: Store
-TextScriptImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Pro/Resources/LineBreaking
+++ b/Pro/Resources/LineBreaking
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: d82c1b31c7e74239bff1220585707d2b
-timeCreated: 1425440388
-licenseType: Store
-TextScriptImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Plugins/TextMesh
+++ b/Assets/Plugins/TextMesh
@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 512a49d95c0c4332bdd98131869c23c9
-folderAsset: yes
-timeCreated: 1441876896
-licenseType: Pro
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/EmojiOne.asset.meta
+++ b/Assets/EmojiOne.asset.meta
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: c41005c129ba4d66911b75229fd70b45
-timeCreated: 1480316912
-licenseType: Pro
-NativeFormatImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Plugins/TextMesh
+++ b/Assets/Plugins/TextMesh
@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 4aecb92fff08436c8303b10eab8da368
-folderAsset: yes
-timeCreated: 1441876950
-licenseType: Pro
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Plugins/TextMesh
+++ b/Assets/Plugins/TextMesh
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: f952c082cb03451daed3ee968ac6c63e
-timeCreated: 1432805430
-licenseType: Store
-NativeFormatImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Plugins/TextMesh
+++ b/Assets/Plugins/TextMesh
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 3f5b5dff67a942289a9defa416b206f3
-timeCreated: 1436653997
-licenseType: Pro
-NativeFormatImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Plugins/TextMesh
+++ b/Assets/Plugins/TextMesh
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: e9f693669af91aa45ad615fc681ed29f
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Pro/Shaders/TMP_Bitmap-Custom-Atlas.shader.meta
+++ b/Pro/Shaders/TMP_Bitmap-Custom-Atlas.shader.meta
@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 48bb5f55d8670e349b6e614913f9d910
-ShaderImporter:
-  externalObjects: {}
-  defaultTextures: []
-  nonModifiableTextures: []
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Pro/Shaders/TMP_Bitmap-Mobile.shader.meta
+++ b/Pro/Shaders/TMP_Bitmap-Mobile.shader.meta
@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 1e3b057af24249748ff873be7fafee47
-ShaderImporter:
-  externalObjects: {}
-  defaultTextures: []
-  nonModifiableTextures: []
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Pro/Shaders/TMP_Bitmap.shader.meta
+++ b/Pro/Shaders/TMP_Bitmap.shader.meta
@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 128e987d567d4e2c824d754223b3f3b0
-ShaderImporter:
-  externalObjects: {}
-  defaultTextures: []
-  nonModifiableTextures: []
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Plugins/TextMesh
+++ b/Assets/Plugins/TextMesh
@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: dd89cf5b9246416f84610a006f916af7
-ShaderImporter:
-  externalObjects: {}
-  defaultTextures: []
-  nonModifiableTextures: []
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Plugins/TextMesh
+++ b/Assets/Plugins/TextMesh
@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 14eb328de4b8eb245bb7cea29e4ac00b
-ShaderImporter:
-  externalObjects: {}
-  defaultTextures: []
-  nonModifiableTextures: []
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Pro/Shaders/TMP_SDF-Mobile
+++ b/Pro/Shaders/TMP_SDF-Mobile
@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: bc1ede39bf3643ee8e493720e4259791
-ShaderImporter:
-  externalObjects: {}
-  defaultTextures: []
-  nonModifiableTextures: []
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Pro/Shaders/TMP_SDF-Mobile
+++ b/Pro/Shaders/TMP_SDF-Mobile
@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: a02a7d8c237544f1962732b55a9aebf1
-ShaderImporter:
-  externalObjects: {}
-  defaultTextures: []
-  nonModifiableTextures: []
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Pro/Shaders/TMP_SDF-Mobile
+++ b/Pro/Shaders/TMP_SDF-Mobile
@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: c8d12adcee749c344b8117cf7c7eb912
-ShaderImporter:
-  externalObjects: {}
-  defaultTextures: []
-  nonModifiableTextures: []
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Pro/Shaders/TMP_SDF-Mobile.shader.meta
+++ b/Pro/Shaders/TMP_SDF-Mobile.shader.meta
@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: fe393ace9b354375a9cb14cdbbc28be4
-ShaderImporter:
-  externalObjects: {}
-  defaultTextures: []
-  nonModifiableTextures: []
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Pro/Shaders/TMP_SDF-Surface-Mobile.shader.meta
+++ b/Pro/Shaders/TMP_SDF-Surface-Mobile.shader.meta
@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 85187c2149c549c5b33f0cdb02836b17
-ShaderImporter:
-  externalObjects: {}
-  defaultTextures: []
-  nonModifiableTextures: []
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Pro/Shaders/TMP_SDF-Surface.shader.meta
+++ b/Pro/Shaders/TMP_SDF-Surface.shader.meta
@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: f7ada0af4f174f0694ca6a487b8f543d
-ShaderImporter:
-  externalObjects: {}
-  defaultTextures: []
-  nonModifiableTextures: []
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Pro/Shaders/TMP_SDF.shader.meta
+++ b/Pro/Shaders/TMP_SDF.shader.meta
@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 68e6db2ebdc24f95958faec2be5558d6
-ShaderImporter:
-  externalObjects: {}
-  defaultTextures: []
-  nonModifiableTextures: []
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Pro/Shaders/TMP_Sprite.shader.meta
+++ b/Pro/Shaders/TMP_Sprite.shader.meta
@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: cf81c85f95fe47e1a27f6ae460cf182c
-ShaderImporter:
-  externalObjects: {}
-  defaultTextures: []
-  nonModifiableTextures: []
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Pro/Shaders/TMPro.cginc.meta
+++ b/Pro/Shaders/TMPro.cginc.meta
@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 407bc68d299748449bbf7f48ee690f8d
-ShaderImporter:
-  externalObjects: {}
-  defaultTextures: []
-  nonModifiableTextures: []
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Pro/Shaders/TMPro_Mobile.cginc.meta
+++ b/Pro/Shaders/TMPro_Mobile.cginc.meta
@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: c334973cef89a9840b0b0c507e0377ab
-ShaderImporter:
-  externalObjects: {}
-  defaultTextures: []
-  nonModifiableTextures: []
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Pro/Shaders/TMPro_Properties.cginc.meta
+++ b/Pro/Shaders/TMPro_Properties.cginc.meta
@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 3997e2241185407d80309a82f9148466
-ShaderImporter:
-  externalObjects: {}
-  defaultTextures: []
-  nonModifiableTextures: []
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Pro/Shaders/TMPro_Surface.cginc.meta
+++ b/Pro/Shaders/TMPro_Surface.cginc.meta
@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: d930090c0cd643c7b55f19a38538c162
-ShaderImporter:
-  externalObjects: {}
-  defaultTextures: []
-  nonModifiableTextures: []
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Plugins/TextMesh
+++ b/Assets/Plugins/TextMesh
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: d0603b6d5186471b96c778c3949c7ce2
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Pro/Sprites/EmojiOne.json.meta
+++ b/Pro/Sprites/EmojiOne.json.meta
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 8f05276190cf498a8153f6cbe761d4e6
-timeCreated: 1480316860
-licenseType: Pro
-TextScriptImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Pro/Sprites/EmojiOne.png.meta
+++ b/Pro/Sprites/EmojiOne.png.meta
@ -1,431 +0,0 @@
-fileFormatVersion: 2
-guid: dffef66376be4fa480fb02b19edbe903
-TextureImporter:
-  fileIDToRecycleName:
-    21300000: EmojiOne_0
-    21300002: EmojiOne_1
-    21300004: EmojiOne_2
-    21300006: EmojiOne_3
-    21300008: EmojiOne_4
-    21300010: EmojiOne_6
-    21300012: EmojiOne_7
-    21300014: EmojiOne_8
-    21300016: EmojiOne_9
-    21300018: EmojiOne_10
-    21300020: EmojiOne_11
-    21300022: EmojiOne_12
-    21300024: EmojiOne_13
-    21300026: EmojiOne_5
-    21300028: EmojiOne_14
-  externalObjects: {}
-  serializedVersion: 5
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 1
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: -1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: -1
-    aniso: -1
-    mipBias: -1
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 2
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spritePixelsToUnits: 100
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 0
-  textureShape: 1
-  singleChannelComponent: 0
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  platformSettings:
-  - serializedVersion: 2
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 512
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-  - serializedVersion: 2
-    buildTarget: Standalone
-    maxTextureSize: 512
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-  - serializedVersion: 2
-    buildTarget: iPhone
-    maxTextureSize: 512
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-  - serializedVersion: 2
-    buildTarget: Android
-    maxTextureSize: 512
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites:
-    - serializedVersion: 2
-      name: EmojiOne_0
-      rect:
-        serializedVersion: 2
-        x: 0
-        y: 384
-        width: 128
-        height: 128
-      alignment: 0
-      pivot: {x: 0.5, y: 0.5}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      physicsShape: []
-      tessellationDetail: 0
-      bones: []
-      spriteID: 4bcc36da2108f2c4ba3de5c921d25c3c
-      vertices: []
-      indices: 
-      edges: []
-      weights: []
-    - serializedVersion: 2
-      name: EmojiOne_1
-      rect:
-        serializedVersion: 2
-        x: 128
-        y: 384
-        width: 128
-        height: 128
-      alignment: 0
-      pivot: {x: 0.5, y: 0.5}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      physicsShape: []
-      tessellationDetail: 0
-      bones: []
-      spriteID: e9eea8093eaeaee4d901c4553f572c22
-      vertices: []
-      indices: 
-      edges: []
-      weights: []
-    - serializedVersion: 2
-      name: EmojiOne_2
-      rect:
-        serializedVersion: 2
-        x: 256
-        y: 384
-        width: 128
-        height: 128
-      alignment: 0
-      pivot: {x: 0.5, y: 0.5}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      physicsShape: []
-      tessellationDetail: 0
-      bones: []
-      spriteID: 49451da35411dcc42a3692e39b0fde70
-      vertices: []
-      indices: 
-      edges: []
-      weights: []
-    - serializedVersion: 2
-      name: EmojiOne_3
-      rect:
-        serializedVersion: 2
-        x: 384
-        y: 384
-        width: 128
-        height: 128
-      alignment: 0
-      pivot: {x: 0.5, y: 0.5}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      physicsShape: []
-      tessellationDetail: 0
-      bones: []
-      spriteID: f65709664b924904790c850a50ca82bc
-      vertices: []
-      indices: 
-      edges: []
-      weights: []
-    - serializedVersion: 2
-      name: EmojiOne_4
-      rect:
-        serializedVersion: 2
-        x: 0
-        y: 256
-        width: 128
-        height: 128
-      alignment: 0
-      pivot: {x: 0.5, y: 0.5}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      physicsShape: []
-      tessellationDetail: 0
-      bones: []
-      spriteID: 5b92c568a5ec9ad4b9ed90e271f1c9a8
-      vertices: []
-      indices: 
-      edges: []
-      weights: []
-    - serializedVersion: 2
-      name: EmojiOne_6
-      rect:
-        serializedVersion: 2
-        x: 256
-        y: 256
-        width: 128
-        height: 128
-      alignment: 0
-      pivot: {x: 0.5, y: 0.5}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      physicsShape: []
-      tessellationDetail: 0
-      bones: []
-      spriteID: b10f2b48b7281594bb8a24a6511a35af
-      vertices: []
-      indices: 
-      edges: []
-      weights: []
-    - serializedVersion: 2
-      name: EmojiOne_7
-      rect:
-        serializedVersion: 2
-        x: 384
-        y: 256
-        width: 128
-        height: 128
-      alignment: 0
-      pivot: {x: 0.5, y: 0.5}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      physicsShape: []
-      tessellationDetail: 0
-      bones: []
-      spriteID: 10a600f9329dc2246a897e89f4d283cd
-      vertices: []
-      indices: 
-      edges: []
-      weights: []
-    - serializedVersion: 2
-      name: EmojiOne_8
-      rect:
-        serializedVersion: 2
-        x: 0
-        y: 128
-        width: 128
-        height: 128
-      alignment: 0
-      pivot: {x: 0.5, y: 0.5}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      physicsShape: []
-      tessellationDetail: 0
-      bones: []
-      spriteID: 66cffa363b90ab14787d8a5b90cf4502
-      vertices: []
-      indices: 
-      edges: []
-      weights: []
-    - serializedVersion: 2
-      name: EmojiOne_9
-      rect:
-        serializedVersion: 2
-        x: 128
-        y: 128
-        width: 128
-        height: 128
-      alignment: 0
-      pivot: {x: 0.5, y: 0.5}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      physicsShape: []
-      tessellationDetail: 0
-      bones: []
-      spriteID: 55cf3d409c9b89349b1e1bdc1cc224ad
-      vertices: []
-      indices: 
-      edges: []
-      weights: []
-    - serializedVersion: 2
-      name: EmojiOne_10
-      rect:
-        serializedVersion: 2
-        x: 256
-        y: 128
-        width: 128
-        height: 128
-      alignment: 0
-      pivot: {x: 0.5, y: 0.5}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      physicsShape: []
-      tessellationDetail: 0
-      bones: []
-      spriteID: 2a9e58eaf96feef42bcefa1cf257193f
-      vertices: []
-      indices: 
-      edges: []
-      weights: []
-    - serializedVersion: 2
-      name: EmojiOne_11
-      rect:
-        serializedVersion: 2
-        x: 384
-        y: 128
-        width: 128
-        height: 128
-      alignment: 0
-      pivot: {x: 0.5, y: 0.5}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      physicsShape: []
-      tessellationDetail: 0
-      bones: []
-      spriteID: 2489120affc155840ae6a7be2e93ce19
-      vertices: []
-      indices: 
-      edges: []
-      weights: []
-    - serializedVersion: 2
-      name: EmojiOne_12
-      rect:
-        serializedVersion: 2
-        x: 0
-        y: 0
-        width: 128
-        height: 128
-      alignment: 0
-      pivot: {x: 0.5, y: 0.5}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      physicsShape: []
-      tessellationDetail: 0
-      bones: []
-      spriteID: 412349a150598d14da4d7140df5c0286
-      vertices: []
-      indices: 
-      edges: []
-      weights: []
-    - serializedVersion: 2
-      name: EmojiOne_13
-      rect:
-        serializedVersion: 2
-        x: 128
-        y: 0
-        width: 128
-        height: 128
-      alignment: 0
-      pivot: {x: 0.5, y: 0.5}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      physicsShape: []
-      tessellationDetail: 0
-      bones: []
-      spriteID: a937464b42bb3634782dea34c6becb6c
-      vertices: []
-      indices: 
-      edges: []
-      weights: []
-    - serializedVersion: 2
-      name: EmojiOne_5
-      rect:
-        serializedVersion: 2
-        x: 256
-        y: 0
-        width: 128
-        height: 128
-      alignment: 0
-      pivot: {x: 0, y: 0}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      physicsShape: []
-      tessellationDetail: 0
-      bones: []
-      spriteID: b0f933b217682124dbfc5e6b89abe3d0
-      vertices: []
-      indices: 
-      edges: []
-      weights: []
-    - serializedVersion: 2
-      name: EmojiOne_14
-      rect:
-        serializedVersion: 2
-        x: 128
-        y: 256
-        width: 128
-        height: 128
-      alignment: 0
-      pivot: {x: 0, y: 0}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      physicsShape: []
-      tessellationDetail: 0
-      bones: []
-      spriteID: f7235c763afe4434e8bb666750a41096
-      vertices: []
-      indices: 
-      edges: []
-      weights: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 3e32d8f5477abfc43b19066e8ad5032e
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-  spritePackingTag: 
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Plugins/Vuforia.meta
+++ b/Assets/Plugins/Vuforia.meta
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 53007eec1527f91449fe15331360537f
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Resources.meta
+++ b/Assets/Resources.meta
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 9490c02570ddccf4c973a624114e202b
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Resources/Questions.json
+++ b/Assets/Resources/Questions.json
@ -0,0 +1,24 @@
+{
+    "questions": [
+        {
+            "type": 0,
+            "question": "Quelle est la formule chimique de l'eau ?",
+            "answers": [
+                "H2O",
+                "CO2",
+                "O2",
+                "H2O2"
+            ],
+            "good_answer": 0
+        },
+        {
+            "type": 1,
+            "question": "Les isotopes d'un élément ont le même nombre de neutrons.",
+            "answers": [
+                "Vrai",
+                "Faux"
+            ],
+            "good_answer": 1
+        }
+    ]
+}
--- a/Assets/Resources/Quizz/Launcher/LoadingCircleAnimator.anim
+++ b/Assets/Resources/Quizz/Launcher/LoadingCircleAnimator.anim
--- a/Assets/Resources/Quizz/Launcher/LoadingCircleAnimatorController.controller
+++ b/Assets/Resources/Quizz/Launcher/LoadingCircleAnimatorController.controller
@ -0,0 +1,72 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!91 &9100000
+AnimatorController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: LoadingCircleAnimatorController
+  serializedVersion: 5
+  m_AnimatorParameters: []
+  m_AnimatorLayers:
+  - serializedVersion: 5
+    m_Name: Base Layer
+    m_StateMachine: {fileID: 7726799029928300137}
+    m_Mask: {fileID: 0}
+    m_Motions: []
+    m_Behaviours: []
+    m_BlendingMode: 0
+    m_SyncedLayerIndex: -1
+    m_DefaultWeight: 0
+    m_IKPass: 0
+    m_SyncedLayerAffectsTiming: 0
+    m_Controller: {fileID: 9100000}
+--- !u!1107 &7726799029928300137
+AnimatorStateMachine:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Base Layer
+  m_ChildStates:
+  - serializedVersion: 1
+    m_State: {fileID: 8077361447851350626}
+    m_Position: {x: 200, y: 220, z: 0}
+  m_ChildStateMachines: []
+  m_AnyStateTransitions: []
+  m_EntryTransitions: []
+  m_StateMachineTransitions: {}
+  m_StateMachineBehaviours: []
+  m_AnyStatePosition: {x: 50, y: 20, z: 0}
+  m_EntryPosition: {x: 50, y: 120, z: 0}
+  m_ExitPosition: {x: 800, y: 120, z: 0}
+  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+  m_DefaultState: {fileID: 8077361447851350626}
+--- !u!1102 &8077361447851350626
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: LoadingCircleAnimator
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: 911fa1720116de54bb17e781ec9e2f5f, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
--- a/Assets/Resources/Quizz/Launcher/loadingCircle.png
+++ b/Assets/Resources/Quizz/Launcher/loadingCircle.png
--- a/Assets/Resources/Quizz/Launcher/tactileLogo.png
+++ b/Assets/Resources/Quizz/Launcher/tactileLogo.png
--- a/Assets/Resources/VuforiaConfiguration.asset.meta
+++ b/Assets/Resources/VuforiaConfiguration.asset.meta
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: d1a94ea68bc100e40b6154bfb9e166b6
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Scripts.meta
+++ b/Assets/Scripts.meta
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 59c29c8b06a488149b22acc65d11a935
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Scripts/Config.meta
+++ b/Assets/Scripts/Config.meta
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: c901c8bad6239f245ba05f2e8c944195
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Scripts/Quizz/QuizzManager.cs
+++ b/Assets/Scripts/Quizz/QuizzManager.cs
@ -0,0 +1,90 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using TMPro;
+
+[System.Serializable]
+public class Question
+{
+    public string question;
+    public string[] answers;
+    public int good_answer;
+    public int type;
+}
+
+[System.Serializable]
+public class Questions
+{
+    public Question[] questions;
+}
+
+public class QuizzManager : MonoBehaviour
+{
+    public GameObject LoadingCanvas;
+    public GameObject TutorialCanvas;
+    public GameObject Questions;
+    public GameObject Home;
+    public TextAsset jsonFile;
+    private bool launched;
+    private bool started;
+    private int answer_button;
+
+    void Start() {
+        LoadingCanvas.GetComponent<Canvas>().enabled = true;
+        TutorialCanvas.GetComponent<Canvas>().enabled = false;
+        Questions.GetComponent<Canvas>().enabled = false;
+        Home.GetComponent<Canvas>().enabled = false;
+        launched = false;
+        started = false;
+    }
+
+    public void ShowTutorial() {
+        if (!launched) {
+            LoadingCanvas.GetComponent<Canvas>().enabled = false;
+            TutorialCanvas.GetComponent<Canvas>().enabled = true;
+            launched = true;
+        }
+    }
+
+    public void LaunchQuizz() {
+        if (!started) {
+            TutorialCanvas.GetComponent<Canvas>().enabled = false;
+            Home.GetComponent<Canvas>().enabled = true;
+            started = true;
+        }
+    }
+
+    public void LeaveApp() {
+        Application.Quit();
+    }
+
+    private void YesNoQuestion(Question question) {
+        GameObject.Find("Question").GetComponent<TMP_Text>().text = question.question;
+        GameObject.Find("AnswerA").GetComponentInChildren<TMP_Text>().text = question.answers[0];
+        GameObject.Find("AnswerB").GetComponentInChildren<TMP_Text>().text = question.answers[1];
+        GameObject.Find("HidingCanva").GetComponent<Canvas>().enabled = false;
+    }
+
+    private void ClassicQuestion(Question question) {
+        GameObject.Find("Question").GetComponent<TMP_Text>().text = question.question;
+        GameObject.Find("HidingCanva").GetComponent<Canvas>().enabled = true;
+        GameObject.Find("AnswerA").GetComponentInChildren<TMP_Text>().text = question.answers[0];
+        GameObject.Find("AnswerB").GetComponentInChildren<TMP_Text>().text = question.answers[1];
+        GameObject.Find("AnswerC").GetComponentInChildren<TMP_Text>().text = question.answers[2];
+        GameObject.Find("AnswerD").GetComponentInChildren<TMP_Text>().text = question.answers[3];
+    }
+
+    public void StartQuizz() {
+        Home.GetComponent<Canvas>().enabled = false;
+        Questions.GetComponent<Canvas>().enabled = true;    
+        Questions questions = JsonUtility.FromJson<Questions>(jsonFile.text);
+        for (int i = 0; i < questions.questions.Length; i++) {
+            Question question = questions.questions[i];
+            if (question.type == 0) {
+                ClassicQuestion(question);
+            } else {
+                YesNoQuestion(question);
+            }
+        }
+    }
+}
--- a/Assets/Scripts/Scripts.asmdef
+++ b/Assets/Scripts/Scripts.asmdef
@ -1,3 +1,16 @@
 {
-	"name": "Scripts"
+    "name": "Scripts",
+    "rootNamespace": "",
+    "references": [
+        "GUID:6055be8ebefd69e48b49212b09b47b2f"
+    ],
+    "includePlatforms": [],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
 }
--- a/Assets/Scripts/Scripts.asmdef.meta
+++ b/Assets/Scripts/Scripts.asmdef.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: de909f71d2be8cc4d89914b8978b423b
-AssemblyDefinitionImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Tests.meta
+++ b/Assets/Tests.meta
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 4751312ad798ec1469354859faf34e03
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Tests/EditMode.meta
+++ b/Assets/Tests/EditMode.meta
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 894a1e2891764e5419dbe7247603a9ce
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Tests/EditMode/EditMode.asmdef
+++ b/Assets/Tests/EditMode/EditMode.asmdef
@ -1,9 +1,24 @@
 {
    "name": "EditMode",
-    "optionalUnityReferences": [
-        "TestAssemblies"
+    "rootNamespace": "",
+    "references": [
+        "UnityEngine.TestRunner",
+        "UnityEditor.TestRunner",
+        "Unity.TextMeshPro"
    ],
    "includePlatforms": [
        "Editor"
-    ]
+    ],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": true,
+    "precompiledReferences": [
+        "nunit.framework.dll"
+    ],
+    "autoReferenced": false,
+    "defineConstraints": [
+        "UNITY_INCLUDE_TESTS"
+    ],
+    "versionDefines": [],
+    "noEngineReferences": false
 }
--- a/Assets/Tests/EditMode/EditMode.asmdef.meta
+++ b/Assets/Tests/EditMode/EditMode.asmdef.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 0a690cded79b030429a30a1c3e17b5df
-AssemblyDefinitionImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Tests/EditMode/EditModeTestTemplate.cs.meta
+++ b/Assets/Tests/EditMode/EditModeTestTemplate.cs.meta
@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 42fbd34e50428014a8f6db6e07b918d9
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Tests/PlayMode.meta
+++ b/Assets/Tests/PlayMode.meta
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 43ba5a1b127ebe4489ca874a970c0a89
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Tests/PlayMode/PlayMode.asmdef
+++ b/Assets/Tests/PlayMode/PlayMode.asmdef
@ -1,6 +1,22 @@
 {
    "name": "PlayMode",
-    "optionalUnityReferences": [
-        "TestAssemblies"
-    ]
+    "rootNamespace": "",
+    "references": [
+        "UnityEngine.TestRunner",
+        "UnityEditor.TestRunner",
+        "Unity.TextMeshPro"
+    ],
+    "includePlatforms": [],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": true,
+    "precompiledReferences": [
+        "nunit.framework.dll"
+    ],
+    "autoReferenced": false,
+    "defineConstraints": [
+        "UNITY_INCLUDE_TESTS"
+    ],
+    "versionDefines": [],
+    "noEngineReferences": false
 }
--- a/Assets/Tests/PlayMode/PlayMode.asmdef.meta
+++ b/Assets/Tests/PlayMode/PlayMode.asmdef.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 044032397fad7ec4c8f9c00892b6cd99
-AssemblyDefinitionImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Tests/PlayMode/PlayModeTestTemplate.cs.meta
+++ b/Assets/Tests/PlayMode/PlayModeTestTemplate.cs.meta
@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 5473ca7c579544b48b4638d999f597c3
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/__Scenes.meta
+++ b/Assets/__Scenes.meta
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: bd72e17db6ea0704f94680c7aa6a5f6e
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/__Scenes/CompositionMode.unity.meta
+++ b/Assets/__Scenes/CompositionMode.unity.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 9d3424ff21733684884de1252630cab6
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- 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.37311953, g: 0.38074014, b: 0.3587274, a: 1}
  m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@ -1166,9 +1166,7 @@ MonoBehaviour:
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_text: 'Mode composition
-
-    (marker-less)'
+  m_text: Quizz Mode !
  m_isRightToLeft: 0
  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
--- a/Assets/__Scenes/MainMenu.unity.meta
+++ b/Assets/__Scenes/MainMenu.unity.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 44d9921e535042a4eb65c474bc560535
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/__Scenes/QuizzMode.unity
+++ b/Assets/__Scenes/QuizzMode.unity
--- a/Assets/script.meta
+++ b/Assets/script.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 833e12f1d550f2c4b96eb6fa3a5ea199
+guid: 7f609c39b51d9e447a6a4a5964011b44
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
--- a/Assets/script/Atom.cs
+++ 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;
+}
--- a/Assets/Scripts/ChangeScene.cs.meta
+++ b/Assets/Scripts/ChangeScene.cs.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 008643b18755e7e41b999511ad7bbd17
+guid: 9d3069c87e06b0c4c9a88c0695461936
 MonoImporter:
  externalObjects: {}
  serializedVersion: 2
--- a/Assets/script/Bond.cs
+++ 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;
+}
--- a/Assets/Scripts/Config/GlobalConfig.cs.meta
+++ b/Assets/Scripts/Config/GlobalConfig.cs.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: d75480a71c557894997198baf39d38c5
+guid: 5ee91233baa5bef4288717efd423d4df
 MonoImporter:
  externalObjects: {}
  serializedVersion: 2
--- a/Assets/script/Molecul.json
+++ b/Assets/script/Molecul.json
@ -0,0 +1,98 @@
+{
+    "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
+            }
+        },
+        {
+            "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
+            }
+        },
+        {
+            "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
+            }
+        }
+    ]
+}
--- a/Assets/script/Molecul.json.meta
+++ b/Assets/script/Molecul.json.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 381dcb09d5029d14897e55f98031fca5
+guid: 3a11d0f923ae50c4d82ee1dda0f629a3
 TextScriptImporter:
  externalObjects: {}
  userData: 
--- a/Assets/script/MoleculeFactory.cs
+++ 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<string, Molecule>  moleculesDictionary; 
+
+    public MoleculeFactory(TextAsset jsonFile){
+        MoleculeFactory.instance = this;
+        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(){
+        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){
+        if(!moleculesDictionary.ContainsKey(formula)){
+            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);
+            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
+        }
+        return sortie;
+    }
+
+}
--- a/Assets/Editor/Migration/AddVuforiaEnginePackage.cs.meta
+++ b/Assets/Editor/Migration/AddVuforiaEnginePackage.cs.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 3bbef22eb814a9647b6c1f03e99d95da
+guid: 68834abede8b8d14d93f46876f40df3e
 MonoImporter:
  externalObjects: {}
  serializedVersion: 2
--- a/Assets/script/Molecules.cs
+++ b/Assets/script/Molecules.cs
@ -0,0 +1,27 @@
+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;
+
+    // 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;
+}
--- a/Assets/Scripts/MainMenuLoader.cs.meta
+++ b/Assets/Scripts/MainMenuLoader.cs.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 54a7d50501985624695af1d7f35310a6
+guid: 23d78ff2f0da0df4ba3f76aa522bfe4c
 MonoImporter:
  externalObjects: {}
  serializedVersion: 2
--- a/Assets/script/Properties.cs
+++ 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;
+}
--- a/Assets/script/Properties.cs.meta
+++ 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: 
--- a/Assets/script/ReadMolecule.cs
+++ b/Assets/script/ReadMolecule.cs
@ -0,0 +1,34 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class ReadMolecule : MonoBehaviour
+{
+    public TextAsset jsonFile;
+
+    void Start(){
+        Molecules moleculesInJson = JsonUtility.FromJson<Molecules>(jsonFile.text);
+
+        int molNum = 0;
+        int dist = 5;
+        foreach (Molecule molecule in moleculesInJson.molecules){
+
+            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++;
+        }
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+}
--- a/Assets/script/ReadMolecule.cs.meta
+++ 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: 
--- a/Assets/tmp/close.cs
+++ b/Assets/tmp/close.cs
@ -0,0 +1,10 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class close : MonoBehaviour
+{
+    public void Quit() {
+        Application.Quit();
+    }
+}
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
@ -4,5 +4,29 @@
 EditorBuildSettings:
  m_ObjectHideFlags: 0
  serializedVersion: 2
-  m_Scenes: []
-  m_configObjects: {}
+  m_Scenes:
+  - 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}
+    UnityEditor.XR.ARCore.ARCoreSettings: {fileID: 11400000, guid: 89a6d18d3df8d3e4fa917b0f9a963bc0,
+      type: 2}
+    UnityEditor.XR.ARKit.ARKitSettings: {fileID: 11400000, guid: de8a8e4f987434338a4b1062feb8d069,
+      type: 2}
+    com.unity.xr.arcore.PlayerSettings: {fileID: 11400000, guid: c2f7b8d7c0bff4d10874cbcf3f24af78,
+      type: 2}
+    com.unity.xr.arfoundation.simulation_settings: {fileID: 11400000, guid: a73d54d47cd632049bd22903052e8cf2,
+      type: 2}
+    com.unity.xr.arkit.PlayerSettings: {fileID: 11400000, guid: b27ec7d82a91a48e69fd689ad6808e5e,
+      type: 2}
+    com.unity.xr.magicleap.magic_leap_settings: {fileID: 11400000, guid: 1eb95d77acb39444e8cf44313496a874,
+      type: 2}
+    com.unity.xr.management.loader_settings: {fileID: 11400000, guid: 58f40b12bbc864f3c96c6505a9a1e1e3,
+      type: 2}
+    com.unity.xr.openxr.settings4: {fileID: 11400000, guid: 6bb381a8ba31f114d9724357633b4625,
+      type: 2}
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@ -156,7 +156,8 @@ PlayerSettings:
  resetResolutionOnWindowResize: 0
  androidSupportedAspectRatio: 1
  androidMaxAspectRatio: 2.1
-  applicationIdentifier: {}
+  applicationIdentifier:
+    Android: com.DefaultCompany.TVIR901_EpiLeARn
  buildNumber:
    Standalone: 0
    VisionOS: 0
@ -164,7 +165,7 @@ PlayerSettings:
    tvOS: 0
  overrideDefaultApplicationIdentifier: 0
  AndroidBundleVersionCode: 1
-  AndroidMinSdkVersion: 22
+  AndroidMinSdkVersion: 26
  AndroidTargetSdkVersion: 0
  AndroidPreferredInstallLocation: 1
  aotOptions: 
@ -253,7 +254,7 @@ PlayerSettings:
  useCustomGradlePropertiesTemplate: 0
  useCustomGradleSettingsTemplate: 0
  useCustomProguardFile: 0
-  AndroidTargetArchitectures: 1
+  AndroidTargetArchitectures: 2
  AndroidTargetDevices: 0
  AndroidSplashScreenScale: 0
  androidSplashScreen: {fileID: 0}
@ -422,8 +423,8 @@ PlayerSettings:
    m_GraphicsJobMode: 0
  m_BuildTargetGraphicsAPIs:
  - m_BuildTarget: AndroidPlayer
-    m_APIs: 150000000b000000
-    m_Automatic: 1
+    m_APIs: 0b000000
+    m_Automatic: 0
  - m_BuildTarget: iOSSupport
    m_APIs: 10000000
    m_Automatic: 1
@ -736,7 +737,8 @@ PlayerSettings:
  scriptingDefineSymbols: {}
  additionalCompilerArguments: {}
  platformArchitecture: {}
-  scriptingBackend: {}
+  scriptingBackend:
+    Android: 1
  il2cppCompilerConfiguration: {}
  il2cppCodeGeneration: {}
  managedStrippingLevel:
--- a/ProjectSettings/TimelineSettings.asset
+++ b/ProjectSettings/TimelineSettings.asset
@ -0,0 +1,16 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &1
+MonoBehaviour:
+  m_ObjectHideFlags: 53
+  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: a287be6c49135cd4f9b2b8666c39d999, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  assetDefaultFramerate: 60
+  m_DefaultFrameRate: 60
--- a/QCAR/lh
+++ b/QCAR/lh
@ -0,0 +1 @@
+SYa2<EFBFBD>q<><71>[<5B><>"b<>	%S<><53><EFBFBD>xY<><13>e.
--- a/QCAR/somedata16
+++ b/QCAR/somedata16
@ -0,0 +1 @@
+AAABmYLL8/oCWYDVnt66QIDwPq6z4DN6r3/58aZWC0zcxYa43TCnvCp9IGuXZLgAObCqIm1fhMsWLttc6QAE6obPbuzCjEssQlT41wW38sIVuVhmsw6vfjVsXAQG/GQOgamARLtOkhTKi309FNa+3akhJu9wuEv5jF3vfRbPBoeMCWZuk4Pr8aP7mPH8+10geWHoSWbxgsaEEgrE0yO2xoQwTy2XOmCzZytqk+moWXU7VBu+0//q+koDSnWbjOkEGUfRwMmBJIK9J5TDJrSf/QZYBcEx1daR47cicuXzCb81VtaSvU5VIb9anoX6fukOHe/nCAfsltXFn+4G24NKlejZ568=
Author	SHA1	Message	Date
clement	de603d405f	Merge remote-tracking branch 'origin/develop' into feat/Molecule-json	2024-01-12 10:48:01 +01:00
clement	118a669371	cleanup code	2024-01-12 10:20:31 +01:00
clement	74a69cf8f7	add todo	2024-01-11 17:16:12 +01:00
clement	e12fed0489	normalent on est quasi bon	2024-01-11 17:11:59 +01:00
clement	33e34e9fde	convert to dict	2024-01-11 16:53:06 +01:00
clement	7c3aa27c71	sync	2024-01-11 16:38:19 +01:00
Gildas	73394e562d	Merge pull request 'Quizz: Adding functionnal quizz feature' (#6 ) from feature/quizz_launcher into develop Reviewed-on: #6	2024-01-11 15:23:47 +01:00
Guska	7d921904d6	Quizz: Removing meta files	2024-01-10 17:16:12 +01:00
Guska	cf05f3814f	Quizz: Adding first version of quizz	2024-01-10 17:14:23 +01:00
Guska	47a6f34f09	Quizz: Finish Launcher	2024-01-08 22:03:29 +01:00
Guska	d1da82d39c	Quizz: Adding loading system	2024-01-08 17:33:23 +01:00
clement	4e63a46dc6	add some mol and test	2024-01-06 18:41:15 +01:00
clement	f1b3c7628c	add somme example	2024-01-06 16:29:29 +01:00
clement	0c4b59e577	sync tout	2024-01-06 15:51:30 +01:00
clement	a6cf8340bf	add molecule reader script	2024-01-06 15:51:13 +01:00
				`@ -0,0 +1 @@`
				`SYa2<EFBFBD>q<><71>[<5B><>"b<> %S<><53><EFBFBD>xY<><13>e.`
				`@ -0,0 +1 @@`
				`AAABmYLL8/oCWYDVnt66QIDwPq6z4DN6r3/58aZWC0zcxYa43TCnvCp9IGuXZLgAObCqIm1fhMsWLttc6QAE6obPbuzCjEssQlT41wW38sIVuVhmsw6vfjVsXAQG/GQOgamARLtOkhTKi309FNa+3akhJu9wuEv5jF3vfRbPBoeMCWZuk4Pr8aP7mPH8+10geWHoSWbxgsaEEgrE0yO2xoQwTy2XOmCzZytqk+moWXU7VBu+0//q+koDSnWbjOkEGUfRwMmBJIK9J5TDJrSf/QZYBcEx1daR47cicuXzCb81VtaSvU5VIb9anoX6fukOHe/nCAfsltXFn+4G24NKlejZ568=`