vite

Assets/Editor/Vuforia/ImageTargetTextures/test/ARA_Speddy_100_scaled.jpg.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: f67fa7582c194bbebc7cd08b1e8a1fe4
+guid: 5e5cced376dc451abf89e9480ee8fb61
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

Assets/Editor/Vuforia/ImageTargetTextures/test/shawn_scaled.jpg.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 7c59f9a8d6ae4f068bdcdffbdb4d1af4
+guid: 2a8d27082cbe4ab29f114e76f933a35d
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

Assets/Editor/Vuforia/ImageTargetTextures/test/speedy_scaled.jpg.meta

@@ -0,0 +1,183 @@
+fileFormatVersion: 2
+guid: a08105de5b8e42459c04a843e7d9be91
+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
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 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: 1
+  cookieLightType: 2
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Lumin
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Editor/Vuforia/ImageTargetTextures/test/subaru_scaled.jpg.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: e4f7ad91a324477682e4fc08a8689d6d
+guid: f8b28e64213e4972a2a8f65598ddd4ff
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

Assets/Scripts/SwipeManagementScript.cs

@@ -77,6 +77,7 @@ public class SwipeManagementScript : MonoBehaviour
             }
         }
             if(numberImage == 1){
+                header.text = "Pour rappel : ";
                 arrow.SetActive(true);
                 warning.SetActive(false);
             }

Assets/Scripts/SwipeScript.cs

@@ -4,34 +4,45 @@ using UnityEngine;
 using UnityEngine.UI;
 using TMPro;
 
+
 public class SwipeScript : MonoBehaviour
 {
+    public TMP_Text header;
     public TMP_Text textSteps;
     public List<Text> lengths;
     public int numberImage;
     public int lengthTexts;
 
-    public Button arrowLeft;
+    public GameObject arrowLeft;
-    public Button arrowRight;
+    public GameObject arrowRight;
-    public Button quit;
 
-    public GameObject canvas1; 
+    public Button buttonleft;
-    public GameObject canvas2; 
+    public Button buttonright;
+
+    public Animator m_Animator;
+
+    public TMP_Text textNumber;
+
+    public List<int> images; 
 
     private Vector2 startTouchPosition;
-    private Vector2 endTouchPosition; 
+    private Vector2 endTouchPosition;
 
+    private GameObject image;
+
+    private Image imageUI;
+ 
     // Start is called before the first frame update
     void Start()
     {
-        Button btnLeft = arrowLeft.GetComponent<Button>();
+        header.text = "Allumer la Speedy 100";
-        Button btnRight = arrowRight.GetComponent<Button>();
+        textSteps.text = lengths[0].text;
-        Button btnQuit = quit.GetComponent<Button>();
+        textNumber.text = "Step 1/" + (lengthTexts+1);
         arrowLeft.gameObject.SetActive(false);
+        Button btnLeft = buttonleft.GetComponent<Button>();
+        Button btnRight = buttonright.GetComponent<Button>();
 		btnLeft.onClick.AddListener(PreviousText);
 		btnRight.onClick.AddListener(NextText);
-        btnQuit.onClick.AddListener(Quit);
-        textSteps.text = lengths[0].text;
     }
 
     // Update is called once per frame
@@ -42,14 +53,15 @@ public class SwipeScript : MonoBehaviour
         }
         if(Input.touchCount > 0 && Input.GetTouch(0).phase == TouchPhase.Ended){
             endTouchPosition = Input.GetTouch(0).position;
-          /*  if(endTouchPosition.x < startTouchPosition.x){
+            if(endTouchPosition.x < startTouchPosition.x){
                 NextText();
             }else{
                 PreviousText();
-            }*/
+            }
-            if(endTouchPosition.y < startTouchPosition.y){
+            if(endTouchPosition.y + 100 < startTouchPosition.y){
                 SwipeDown();
-            } else {
+            } 
+            if(endTouchPosition.y - 100 > startTouchPosition.y){
                 SwipeUp();
             }
         }
@@ -67,7 +79,15 @@ public class SwipeScript : MonoBehaviour
             if(numberImage != 0){
                 arrowLeft.gameObject.SetActive(true);
              }
-            textSteps.text = lengths[numberImage].text;
+            if(images.Contains(numberImage - 1)){
+                DisableImageStep();
+            }
+            if(images.Contains(numberImage)){
+                SetImageStep();
+            }else{
+                textSteps.text = lengths[numberImage].text;
+                textNumber.text = "Step" + (numberImage+1) + "/" + (lengthTexts+1);
+            }
         }
     }
 
@@ -81,25 +101,37 @@ public class SwipeScript : MonoBehaviour
             }
              if(numberImage != lengthTexts){
                 arrowRight.gameObject.SetActive(true);
-             }
+            }
-            textSteps.text = lengths[numberImage].text; 
+            if(images.Contains(numberImage + 1)){
+                DisableImageStep();
+            }
+            if(images.Contains(numberImage)){
+                SetImageStep();
+            }else{
+                textSteps.text = lengths[numberImage].text;
+                textNumber.text = "Step" + (numberImage+1) + "/" + (lengthTexts+1);
+            }
         }
     }
 
-    private void Quit(){
-        canvas1.SetActive(false);
-        canvas2.SetActive(false);
-    }
-    public void Enter(){
-        canvas1.SetActive(true);
-        canvas2.SetActive(true);
-              Debug.Log("Hello: ");
-    }
-
     private void SwipeDown(){
-        PreviousText();
+        m_Animator.ResetTrigger("SwipeUp");
+        m_Animator.SetTrigger("SwipeDown");
     }
       private void SwipeUp(){
-        NextText();
+        m_Animator.ResetTrigger("SwipeDown");
+        m_Animator.SetTrigger("SwipeUp");
+    }
+
+    private void SetImageStep(){
+        textSteps.text = "";
+        textNumber.text = "Step" + (numberImage+1) + "/" + (lengthTexts+1);
+        image = GameObject.Find("Image"+ numberImage);
+        imageUI = image.GetComponent<Image>();
+        imageUI.enabled = true;
+    }
+
+    private void DisableImageStep(){
+        imageUI.enabled = false;
     }
 }

Assets/StreamingAssets/Vuforia/test.dat.meta

@@ -1,2 +1,2 @@
 fileFormatVersion: 2
-guid: 64fbb1066282436bbd60098bc75fe64a
+guid: a15da078a45e43adaf328da578dc3dd2

Assets/StreamingAssets/Vuforia/test.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <QCARConfig xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="qcar_config.xsd">
   <Tracking>
+    <ImageTarget name="speedy" size="100.000000 133.333328" />
     <ImageTarget name="ARA_Speddy_100" size="100.000000 100.000000" />
     <ImageTarget name="subaru" size="100.000000 50.000000" />
     <ImageTarget name="shawn" size="100.000000 100.000000" />

Assets/StreamingAssets/Vuforia/test.xml.meta

@@ -1,2 +1,2 @@
 fileFormatVersion: 2
-guid: 571ad3b5983441db8bc50c02fb37417d
+guid: 2cb2c7cc3a7e46c9a0e1ee136991ae13

Assets/Text/TextStep1.prefab

@@ -79,5 +79,5 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "Allumer la Speedy 100 en appuyant sur l\u2019interrupteur Marche/Arr\xEAt
+  m_Text: Assurez vous que la speedy est allume en suivant la premiere etape du tutoriel
-    de la machine."
+    (marqueur a l avant de la machine)

Assets/Text/TextStepIntro.prefab

@@ -0,0 +1,83 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &8773979142530325389
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 702887422664560343}
+  - component: {fileID: 7773009873150152974}
+  - component: {fileID: 7258324625842614780}
+  m_Layer: 5
+  m_Name: TextStepIntro
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &702887422664560343
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8773979142530325389}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: -12.999986}
+  m_LocalScale: {x: 1.5000002, y: 1.5000002, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: -1.4999998}
+  m_SizeDelta: {x: 200, y: 50}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7773009873150152974
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8773979142530325389}
+  m_CullTransparentMesh: 1
+--- !u!114 &7258324625842614780
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8773979142530325389}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 652f7165b7c30ab46af6c4aad90a639b, type: 2}
+    m_FontSize: 16
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "Allumer la Speedy 100 en appuyant sur l\u2019interrupteur Marche/Arr\xEAt
+    de la machine."

Assets/Text/TextStepIntro.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: b6ed2b361579f8a42b93cd176563a8ea
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: