Merge remote-tracking branch 'origin/develop' into feat/molecule/bons

# Conflicts: # Assets/Editor/Vuforia/ImageTargetTextures/T-VIR/hydro_scaled.jpg.meta # Assets/Editor/Vuforia/ImageTargetTextures/T-VIR/hydrogen_scaled.jpg.meta # Assets/Editor/Vuforia/ImageTargetTextures/T-VIR/hydrogene_marker_scaled.jpg.meta # Assets/Editor/Vuforia/ImageTargetTextures/T-VIR/oxy_scaled.jpg.meta # Assets/Editor/Vuforia/ImageTargetTextures/T-VIR/oxygen_scaled.jpg.meta # Assets/Editor/Vuforia/ImageTargetTextures/T-VIR/oxygene_marker_scaled.jpg.meta # Assets/XR/Settings/OpenXR Package Settings.asset # Assets/__Scenes/MainMenu.unity
on est good
2024-01-18 13:46:44 +01:00 · 2024-01-18 14:24:40 +01:00 · 2024-01-18 14:00:09 +01:00
76 changed files with 1058 additions and 37 deletions
--- a/Assets/Plugins/TextMesh
+++ b/Assets/Plugins/TextMesh
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3f041482311f2384699d1dfdcb711fde
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Plugins/TextMesh
+++ b/Assets/Plugins/TextMesh
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6b8294403b5e34f41b2ea91e92f49ecb
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Pro/Documentation/TextMesh
+++ b/Pro/Documentation/TextMesh
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: ee577d162e5b949428126674840c6d27
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Plugins/TextMesh
+++ b/Assets/Plugins/TextMesh
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 22087337969565e45b7b28d809e61c2f
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Pro/Fonts/LiberationSans
+++ b/Pro/Fonts/LiberationSans
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 45f1e9889b7d3a342be9a95e6dea1204
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Pro/Fonts/LiberationSans.ttf.meta
+++ b/Pro/Fonts/LiberationSans.ttf.meta
@ -0,0 +1,21 @@
+fileFormatVersion: 2
+guid: b9429476feff32343911eac34c1d1ecc
+TrueTypeFontImporter:
+  externalObjects: {}
+  serializedVersion: 4
+  fontSize: 16
+  forceTextureCase: -2
+  characterSpacing: 0
+  characterPadding: 1
+  includeFontData: 1
+  fontNames:
+  - Liberation Sans
+  fallbackFontReferences: []
+  customCharacters: 
+  fontRenderingMode: 0
+  ascentCalculationMode: 1
+  useLegacyBoundsCalculation: 0
+  shouldRoundAdvanceValue: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Plugins/TextMesh
+++ b/Assets/Plugins/TextMesh
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a0a249811a24a424a89c6b9cd0f76056
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Plugins/TextMesh
+++ b/Assets/Plugins/TextMesh
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 631fd89cd0bd7434eba314afb11d36c7
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Materials/LiberationSans
+++ b/Materials/LiberationSans
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7537d0dc3d38d0c408109e9412749ab8
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Materials/LiberationSans
+++ b/Materials/LiberationSans
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f5a7e5103bdda2c43a80332a0e52383b
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Materials/LiberationSans
+++ b/Materials/LiberationSans
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3fcd6464e0bbb2a499f064abe990fe73
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Materials/LiberationSans
+++ b/Materials/LiberationSans
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d964a13953657c04a958252184207567
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Pro/Resources/LineBreaking
+++ b/Pro/Resources/LineBreaking
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 34c21652c0642eb4eb52dbe5ec77c19f
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Pro/Resources/LineBreaking
+++ b/Pro/Resources/LineBreaking
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 1fbfc6b6eff081547a51ed1c930679e9
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Plugins/TextMesh
+++ b/Assets/Plugins/TextMesh
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5daf83ac24776744a8150ccdbd9b4c7f
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/EmojiOne.asset.meta
+++ b/Assets/EmojiOne.asset.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 893453dbc6717854f8bc9cf6de15f179
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Plugins/TextMesh
+++ b/Assets/Plugins/TextMesh
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: fd392178df2342841b89525dd7492b8d
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Plugins/TextMesh
+++ b/Assets/Plugins/TextMesh
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 44d52f7a42e22634281df2d10a314432
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Plugins/TextMesh
+++ b/Assets/Plugins/TextMesh
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ae3c61e12b8131949a4140c20493f258
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Plugins/TextMesh
+++ b/Assets/Plugins/TextMesh
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: cbb7e05116cd2104d99e66df48197681
+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
@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 11bf87a0ee278fb499cd4650825b95ff
+ShaderImporter:
+  externalObjects: {}
+  defaultTextures: []
+  nonModifiableTextures: []
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Pro/Shaders/TMP_Bitmap-Mobile.shader.meta
+++ b/Pro/Shaders/TMP_Bitmap-Mobile.shader.meta
@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 098872affcf62c9479a94a01a077a4f3
+ShaderImporter:
+  externalObjects: {}
+  defaultTextures: []
+  nonModifiableTextures: []
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Pro/Shaders/TMP_Bitmap.shader.meta
+++ b/Pro/Shaders/TMP_Bitmap.shader.meta
@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 5bd7fd7e524b30a44b5a1afbcecda213
+ShaderImporter:
+  externalObjects: {}
+  defaultTextures: []
+  nonModifiableTextures: []
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Plugins/TextMesh
+++ b/Assets/Plugins/TextMesh
@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 96fac00d96d1193489b39288ab80b7ee
+ShaderImporter:
+  externalObjects: {}
+  defaultTextures: []
+  nonModifiableTextures: []
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Plugins/TextMesh
+++ b/Assets/Plugins/TextMesh
@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 10a669d18f973b341a17be4b1df75f5d
+ShaderImporter:
+  externalObjects: {}
+  defaultTextures: []
+  nonModifiableTextures: []
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Pro/Shaders/TMP_SDF-Mobile
+++ b/Pro/Shaders/TMP_SDF-Mobile
@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 9c3bc2e3078ad4d4597002924f1f8233
+ShaderImporter:
+  externalObjects: {}
+  defaultTextures: []
+  nonModifiableTextures: []
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Pro/Shaders/TMP_SDF-Mobile
+++ b/Pro/Shaders/TMP_SDF-Mobile
@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 02530543cb0e3fd439412c6f4082a6bb
+ShaderImporter:
+  externalObjects: {}
+  defaultTextures: []
+  nonModifiableTextures: []
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Pro/Shaders/TMP_SDF-Mobile
+++ b/Pro/Shaders/TMP_SDF-Mobile
@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 7079c11c311c95946845135d2c3bb4bb
+ShaderImporter:
+  externalObjects: {}
+  defaultTextures: []
+  nonModifiableTextures: []
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Pro/Shaders/TMP_SDF-Mobile.shader.meta
+++ b/Pro/Shaders/TMP_SDF-Mobile.shader.meta
@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 13a4c87b522c02e4399ebebb2acc9a5d
+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
@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 5a7c079654525b241a58b23a0231517d
+ShaderImporter:
+  externalObjects: {}
+  defaultTextures: []
+  nonModifiableTextures: []
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Pro/Shaders/TMP_SDF-Surface.shader.meta
+++ b/Pro/Shaders/TMP_SDF-Surface.shader.meta
@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 9705f7de62b9aff488c8c012709e7190
+ShaderImporter:
+  externalObjects: {}
+  defaultTextures: []
+  nonModifiableTextures: []
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Pro/Shaders/TMP_SDF.shader.meta
+++ b/Pro/Shaders/TMP_SDF.shader.meta
@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 759fc2a1ed78eec47bcefba32cf07aaa
+ShaderImporter:
+  externalObjects: {}
+  defaultTextures: []
+  nonModifiableTextures: []
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Pro/Shaders/TMP_Sprite.shader.meta
+++ b/Pro/Shaders/TMP_Sprite.shader.meta
@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: de18cb3f7aafeed4cb8704835047934f
+ShaderImporter:
+  externalObjects: {}
+  defaultTextures: []
+  nonModifiableTextures: []
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Pro/Shaders/TMPro.cginc.meta
+++ b/Pro/Shaders/TMPro.cginc.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 9da8903d7be85b341b5cbbf8841f66d0
+ShaderIncludeImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Pro/Shaders/TMPro_Mobile.cginc.meta
+++ b/Pro/Shaders/TMPro_Mobile.cginc.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 5fb361ac00737c74aa6413da47ba4a06
+ShaderIncludeImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Pro/Shaders/TMPro_Properties.cginc.meta
+++ b/Pro/Shaders/TMPro_Properties.cginc.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 1dba8d53d0673a2438d29fae5b7b8669
+ShaderIncludeImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Pro/Shaders/TMPro_Surface.cginc.meta
+++ b/Pro/Shaders/TMPro_Surface.cginc.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 2f096547bc1e5ea41a3185bfc19fb112
+ShaderIncludeImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Plugins/TextMesh
+++ b/Assets/Plugins/TextMesh
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: eec67d9621579f143b8f176f1bbf9ca0
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Plugins/TextMesh
+++ b/Assets/Plugins/TextMesh
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 1ec4e29548a6ad9469cae82346fd2850
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Pro/Sprites/EmojiOne.json.meta
+++ b/Pro/Sprites/EmojiOne.json.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 18f3abbace1f74847909ce0a0cc4a246
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Pro/Sprites/EmojiOne.png.meta
+++ b/Pro/Sprites/EmojiOne.png.meta
@ -0,0 +1,140 @@
+fileFormatVersion: 2
+guid: 26a4663c0e7610741984393c00a23d10
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Resources/Questions.json.meta
+++ b/Assets/Resources/Questions.json.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 7a1301745ea9a5e42abc28700f294291
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Resources/Quizz.meta
+++ b/Assets/Resources/Quizz.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 73cdfa164b2e54945834132df0004127
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Resources/Quizz/Launcher.meta
+++ b/Assets/Resources/Quizz/Launcher.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 33ce1d326c350db4684bb4a2f96dfe31
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Resources/Quizz/Launcher/LoadingCircleAnimator.anim.meta
+++ b/Assets/Resources/Quizz/Launcher/LoadingCircleAnimator.anim.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8cfff928209192f4984bd6a3b7aa370d
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Resources/Quizz/Launcher/LoadingCircleAnimatorController.controller.meta
+++ b/Assets/Resources/Quizz/Launcher/LoadingCircleAnimatorController.controller.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 62107ed3efe61da4d8eeaf10ccbfc963
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Resources/Quizz/Launcher/loadingCircle.png.meta
+++ b/Assets/Resources/Quizz/Launcher/loadingCircle.png.meta
@ -0,0 +1,140 @@
+fileFormatVersion: 2
+guid: 143f809b8a98a614bb6df8af81f5b1f4
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Resources/Quizz/Launcher/tactileLogo.png.meta
+++ b/Assets/Resources/Quizz/Launcher/tactileLogo.png.meta
@ -0,0 +1,140 @@
+fileFormatVersion: 2
+guid: c6804deefa1f78d4da1fd53facd0f09a
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scripts.meta
+++ b/Assets/Scripts.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 72676733e7308754ebbd3ba85f0a2f68
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scripts/ChangeScene.cs.meta
+++ b/Assets/Scripts/ChangeScene.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 06100a51557f407489c581eb496f125e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scripts/Config.meta
+++ b/Assets/Scripts/Config.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ad8e0cc1188e15747af8e42ff7d3d8a8
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scripts/Config/GlobalConfig.cs.meta
+++ b/Assets/Scripts/Config/GlobalConfig.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 052db604c679d014ca89bcc5fb196894
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scripts/MainMenuLoader.cs.meta
+++ b/Assets/Scripts/MainMenuLoader.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 73df1f34c98543044a579d9b860b1e49
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scripts/Quizz.meta
+++ b/Assets/Scripts/Quizz.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c8ecfc45ad0cb3c4cbca39b28dfd5cec
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scripts/Quizz/QuizzManager.cs.meta
+++ b/Assets/Scripts/Quizz/QuizzManager.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 64b8ea1ee8224a74198aaf77b933df14
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scripts/Scripts.asmdef.meta
+++ b/Assets/Scripts/Scripts.asmdef.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 8175eb73d3984e040b45fa769b549ba5
+AssemblyDefinitionImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Tests.meta
+++ b/Assets/Tests.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c5dacd40cf104eb469cee19c2aa41213
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Tests/EditMode.meta
+++ b/Assets/Tests/EditMode.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 53df249a461ca33479e2fa124486fd8c
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Tests/EditMode/EditMode.asmdef.meta
+++ b/Assets/Tests/EditMode/EditMode.asmdef.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 07ad5578c640d5c408c6af333bafba88
+AssemblyDefinitionImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Tests/EditMode/EditModeTestTemplate.cs.meta
+++ b/Assets/Tests/EditMode/EditModeTestTemplate.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 399d1e029f333d64589753da58c023c9
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Tests/PlayMode.meta
+++ b/Assets/Tests/PlayMode.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 045c3aad127db9944a720d2b48f5207b
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Tests/PlayMode/PlayMode.asmdef.meta
+++ b/Assets/Tests/PlayMode/PlayMode.asmdef.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 15ff00b1df6796f4b809f27294bab4ef
+AssemblyDefinitionImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Tests/PlayMode/PlayModeTestTemplate.cs.meta
+++ b/Assets/Tests/PlayMode/PlayModeTestTemplate.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: a90fcc48d62016740bdd1938c6de8abb
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/XR/Settings/OpenXR
+++ b/Assets/XR/Settings/OpenXR
@ -69,21 +69,6 @@ MonoBehaviour:
  - {fileID: 328694643663705065}
  m_renderMode: 1
  m_depthSubmissionMode: 0
--- !u!114 &-7790167871726551409
-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 &-6711655287692442740
 MonoBehaviour:
  m_ObjectHideFlags: 0
@ -367,7 +352,7 @@ MonoBehaviour:
  Values:
  - {fileID: -2820601610673514729}
  - {fileID: -7933880819051152802}
-  - {fileID: -7790167871726551409}
+  - {fileID: 2102387217465899027}
 --- !u!114 &328694643663705065
 MonoBehaviour:
  m_ObjectHideFlags: 0
@ -471,6 +456,21 @@ MonoBehaviour:
  company: Unity
  priority: 0
  required: 0
+--- !u!114 &2102387217465899027
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b5a1f07dc5afe854f9f12a4194aca3fb, type: 3}
+  m_Name: WebGL
+  m_EditorClassIdentifier: 
+  features: []
+  m_renderMode: 1
+  m_depthSubmissionMode: 0
 --- !u!114 &2292148946669457467
 MonoBehaviour:
  m_ObjectHideFlags: 0
--- a/Assets/__Scenes.meta
+++ b/Assets/__Scenes.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b3857c07573aa414096e099d2f2ff021
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/__Scenes/CompositionMode.unity.meta
+++ b/Assets/__Scenes/CompositionMode.unity.meta
@ -1,9 +1,5 @@
 fileFormatVersion: 2
-<<<<<<< HEAD
-guid: 6070172c745f35649bc6e7ec2e810f20
-=======
 guid: c9caa719613dc274081a67ffec6035b9
->>>>>>> 807aa8c3c6e62c5d033064e3190ae432fb66db03
 DefaultImporter:
  externalObjects: {}
  userData: 
--- a/Assets/__Scenes/MainMenu.unity
+++ b/Assets/__Scenes/MainMenu.unity
@ -38,7 +38,7 @@ RenderSettings:
  m_ReflectionIntensity: 1
  m_CustomReflection: {fileID: 0}
  m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.3708985, g: 0.37837005, b: 0.3572253, a: 1}
+  m_IndirectSpecularColor: {r: 0.37311918, g: 0.3807398, b: 0.35872716, a: 1}
  m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@ -332,6 +332,52 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 136169417}
  m_CullTransparentMesh: 1
+--- !u!1 &524575261
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 524575263}
+  - component: {fileID: 524575262}
+  m_Layer: 0
+  m_Name: GameObject
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &524575262
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 524575261}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8c2433f4f2c3ba343851fdf3c660c21e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  moleculeJson: {fileID: 4900000, guid: 3a11d0f923ae50c4d82ee1dda0f629a3, type: 3}
+  atomJson: {fileID: 4900000, guid: ab8f44086e6af6f48a38b7d7d595e9a2, type: 3}
+--- !u!4 &524575263
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 524575261}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -0.5532938, y: -1.3569599, z: -4.0075746}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &534669303
 GameObject:
  m_ObjectHideFlags: 0
@ -1250,3 +1296,4 @@ SceneRoots:
  - {fileID: 693850230}
  - {fileID: 732397232}
  - {fileID: 534669306}
+  - {fileID: 524575263}
--- a/Assets/__Scenes/MainMenu.unity.meta
+++ b/Assets/__Scenes/MainMenu.unity.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 21847698021eba44f950c2f660cf05d4
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/__Scenes/QuizzMode.unity.meta
+++ b/Assets/__Scenes/QuizzMode.unity.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: cc3244f04212efd42b790b18c736d78a
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/script/FactoryTester.cs
+++ b/Assets/script/FactoryTester.cs
@ -7,13 +7,18 @@ using UnityEngine;

 class MoleculeFactoryTester: MonoBehaviour {

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

    void Start(){
-        MoleculeFactory factory = MoleculeFactory.getInstrance(this.jsonFile);
-        //GameObject mol = factory.createMolecule("O2");
+        MoleculeFactory factory = MoleculeFactory.getInstrance(this.moleculeJson);
+        AtomeFactory atomeFactory = AtomeFactory.getInstrance(this.atomJson);
+        factory.setAtomFactory(atomeFactory);
+        GameObject mol = factory.createMolecule("O2");
        GameObject mol2 = factory.createMolecule("H2O");
-        //mol.transform.position = new Vector3(0,1,0);
+        mol.transform.position = new Vector3(0,1,0);
+        GameObject mol3 = factory.createMolecule("C4H10");
+        mol3.transform.position = new Vector3(0,5,0);
        //GameObject bon = GameOject.CreatePrimitive(PrimitiveType.)
    }

--- a/Assets/script/Molecul.json
+++ b/Assets/script/Molecul.json
@ -97,13 +97,13 @@
            "name": "Eau",
            "formula": "H2O",
            "atoms": [
-                {"element": "H", "geometry": [0.0, 0.0, 0.0]},
-                {"element": "O", "geometry": [0.74, 0.0, 0.0]},
-                {"element": "H", "geometry": [-0.74, 0.0, 0.0]}
+                {"element": "O", "geometry": [0.0, 0.0, 0.0]},
+                {"element": "H", "geometry": [1.2, 0.0, 0.0]},
+                {"element": "H", "geometry": [-1.2, 0.0, 0.0]}
            ],
            "bonds": [
                {"atoms": [0, 1], "order": 1},
-                {"atoms": [1, 2], "order": 1}
+                {"atoms": [0, 2], "order": 1}
            ],
            "properties": {
                "molecularMass": 18.01528,
--- a/Assets/script/MoleculeFactory.cs
+++ b/Assets/script/MoleculeFactory.cs
@ -8,8 +8,7 @@ public class MoleculeFactory : MonoBehaviour{

    public TextAsset jsonFile;

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

    private Molecules moleculesInJson;
@ -51,10 +50,9 @@ public class MoleculeFactory : MonoBehaviour{
            sphere.transform.parent = sortie.transform;
            sphere.name = atom.element;
            sphere.transform.localPosition = new Vector3(atom.geometry[0], atom.geometry[1], atom.geometry[2]);
-            //AtomeInformation att = Atomfactory.createAtome(atom.element);
+            AtomeInformation att = atomeFactory.createAtome(atom.element);
            Color myColor = new Color(0, 0, 1, 1);
-            //TODO géré atom factory
-            //ColorUtility.TryParseHtmlString(att.representation.color, out myColor);
+            ColorUtility.TryParseHtmlString(att.representation.color, out myColor);
            sphere.GetComponent<Renderer>().material.color = myColor;
        }
        foreach (Bond bond in molecule.bonds){
@ -66,12 +64,16 @@ public class MoleculeFactory : MonoBehaviour{
            float atom2z = molecule.atoms[bond.atoms[1]].geometry[2];
            Vector3 vecAtom1 = new Vector3(atom1x, atom1y, atom1z);
            Vector3 vecAtom2 = new Vector3(atom2x, atom2y, atom2z);
-            GameObject GObond = CreateCylinderBetweenPoints(vecAtom1,vecAtom2, 0.5f);
+            GameObject GObond = CreateCylinderBetweenPoints(vecAtom1,vecAtom2, 0.3f);
            GObond.transform.parent = sortie.transform;
        }
        return sortie;
    }

+    public void setAtomFactory(AtomeFactory atomeFactory){
+        this.atomeFactory = atomeFactory;
+    }
+
    private GameObject CreateCylinderBetweenPoints(Vector3 start, Vector3 end, float width){
        var offset = end - start;
        var scale = new Vector3(width, offset.magnitude / 2.0f, width);
--- a/Assets/tmp.meta
+++ b/Assets/tmp.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4eac756168f7a8948ac26ce8f389806e
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/tmp/close.cs.meta
+++ b/Assets/tmp/close.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d9b90a03e7379eb468f864adbe3633aa
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/QCAR/lh
+++ b/QCAR/lh
@ -1 +1 @@
-*<2A>*'	w<><10>~<7E>*v2A<32>I<EFBFBD>`<60><>Ӧ(<28>W<><03>Y
+SYa2<EFBFBD>q<><71>[<5B><>"b<>	%S<><53><EFBFBD>xY<><13>e.
--- a/QCAR/somedata16
+++ b/QCAR/somedata16
@ -1 +1 @@
-AAABmYLL8/oCWYDVnt66QIDwPq6z4DN6r3/58aZWC0zcxYa43TCnvCp9IGuXZLgAObCqIm1fhMsWLttc6QAE6obPbuzCjEssQlT41wW38sIVuVhmsw6vfjVsXAQG/GQOgamARLtOkhTKi309FNa+3akhJu9wuEv5jF3vfRbPBoeMCWZuk4Pr8aP7mPH8+10geWHoSWbxgsaEEgrE0yO2xoQwTy2XOmCzZytqk+moWXU7VBu+0//q+koDSnWbjOkEGUfRwMmBJIK9J5TDJrSf/QZYBcEx1daR47cicuXzCb81VtaSvU5VIb9anoX6fukOHe/nCAfsltXFn+4G24NKlejZ568=
+AAABmY7g9UmlfucNZM2mK1+zBTca7O7gdAXUc9FcH4yUbYfsFOfH72rVb0qPESQq/9HBlqfD04SyJF6jtD6oQDsZxFAYgmMCBkOzNr/C/s4mdV37Qw5Nm9GqecPYpccvAWOqH/VAtFBp5ksgnAnVhuHUqh0NmvpixXq82Meo/bg7usPAWSDsQt/6kR89nttLOknq/Rt+SN8E91Txj6nsYZH8gsxrgC9MYPO0koHuIvfeLk0wcqrMzxZawaNLp6CNWgUYDXWIWW1AtB9dY5p56nnk/Yd4MyRevYDtcWdXCdiam48zdO470AuA8DkAFHOttVURidwRkVKq4z40E6J+5V3NqDg=