bugs fixed

5e82b67d · Bošániová Monika · 3ab03fd4 · 3ab03fd4 · 5e82b67d · 5e82b67d
Commit 5e82b67d authored Jul 19, 2021 by Bošániová Monika
--- a/Assets/Prefabs/Inkedtutorial_LI.jpg
+++ b/Assets/Prefabs/Inkedtutorial_LI.jpg
--- a/Assets/Prefabs/tutorial.png
+++ b/Assets/Prefabs/tutorial.png
--- a/Assets/Scenes/CubeSolver.unity
+++ b/Assets/Scenes/CubeSolver.unity
@@ -433,6 +433,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  errorMsgBox: {fileID: 213162959}
+  algorithmPhaseBox: {fileID: 458956189}
 --- !u!1 &62275331
 GameObject:
  m_ObjectHideFlags: 0
@@ -2434,7 +2435,7 @@ RectTransform:
  m_LocalScale: {x: 0.8, y: 0.8, z: 1}
  m_Children: []
  m_Father: {fileID: 645594858}
-  m_RootOrder: 1
+  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}
@@ -3600,7 +3601,7 @@ RectTransform:
  m_LocalScale: {x: 0.8, y: 0.8, z: 1}
  m_Children: []
  m_Father: {fileID: 645594858}
-  m_RootOrder: 2
+  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
@@ -3801,9 +3802,9 @@ RectTransform:
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 4.9312787, y: 5.0082994, z: 1.7228012}
  m_Children:
-  - {fileID: 1368017018}
  - {fileID: 340423410}
  - {fileID: 613982297}
+  - {fileID: 1888277885}
  m_Father: {fileID: 273764824}
  m_RootOrder: 6
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -5964,7 +5965,6 @@ GameObject:
  serializedVersion: 6
  m_Component:
  - component: {fileID: 981341156}
-  - component: {fileID: 981341157}
  m_Layer: 5
  m_Name: CubeMap
  m_TagString: Untagged
@@ -5997,30 +5997,6 @@ RectTransform:
  m_AnchoredPosition: {x: 301, y: -267}
  m_SizeDelta: {x: 100, y: 100}
  m_Pivot: {x: 1, y: 0}
--- !u!114 &981341157
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 981341155}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 8d89c5df953f46f4aac3a8eb1bee95df, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  up: {fileID: 1886305500}
-  down: {fileID: 517454407}
-  left: {fileID: 177416185}
-  right: {fileID: 209829061}
-  front: {fileID: 239965589}
-  back: {fileID: 572136616}
-  blue: {fileID: 2100000, guid: 8b908df66e033894e952ac577be7884d, type: 2}
-  green: {fileID: 2100000, guid: 21f899676ae3b3e458ec298f4589efe4, type: 2}
-  red: {fileID: 2100000, guid: 008ed915e9747194d8473e08a7536708, type: 2}
-  orange: {fileID: 2100000, guid: 2e33c8fb25bdc3941b1d3dfde4ddeb9e, type: 2}
-  white: {fileID: 2100000, guid: 5601add48eb7ebe4cb5c251dde8c8998, type: 2}
-  yellow: {fileID: 2100000, guid: 51d0d8d3349a2f547b9a9bdc42876e8e, type: 2}
 --- !u!1 &1003309669
 GameObject:
  m_ObjectHideFlags: 0
@@ -7598,84 +7574,6 @@ Transform:
  m_Father: {fileID: 0}
  m_RootOrder: 5
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1368017017
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1368017018}
-  - component: {fileID: 1368017020}
-  - component: {fileID: 1368017019}
-  m_Layer: 5
-  m_Name: Text
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!224 &1368017018
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1368017017}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 645594858}
-  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: 49.997, y: 0}
-  m_SizeDelta: {x: 229.95334, y: 100}
-  m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1368017019
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1368017017}
-  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: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
-  m_RaycastTarget: 1
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 1
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 0
-    m_MaxSize: 300
-    m_Alignment: 4
-    m_AlignByGeometry: 0
-    m_RichText: 0
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: Rotation
--- !u!222 &1368017020
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1368017017}
-  m_CullTransparentMesh: 0
 --- !u!1 &1371071663 stripped
 GameObject:
  m_CorrespondingSourceObject: {fileID: 4943659754933011787, guid: 46ddfc1117a01e749acd6f49525775fa,
@@ -11375,6 +11273,162 @@ RectTransform:
  m_AnchoredPosition: {x: 53, y: 116.05319}
  m_SizeDelta: {x: 100, y: 100}
  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &1888277884
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1888277885}
+  - component: {fileID: 1888277887}
+  - component: {fileID: 1888277886}
+  m_Layer: 5
+  m_Name: Text (TMP)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1888277885
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1888277884}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 645594858}
+  m_RootOrder: 2
+  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: 49.997, y: -0.00002861}
+  m_SizeDelta: {x: 229.95343, y: 99.99997}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1888277886
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1888277884}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_text: Rotation
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  m_fontSharedMaterials: []
+  m_fontMaterial: {fileID: 0}
+  m_fontMaterials: []
+  m_fontColor32:
+    serializedVersion: 2
+    rgba: 4286414205
+  m_fontColor: {r: 0.49056602, g: 0.49056602, b: 0.49056602, a: 1}
+  m_enableVertexGradient: 0
+  m_colorMode: 3
+  m_fontColorGradient:
+    topLeft: {r: 1, g: 1, b: 1, a: 1}
+    topRight: {r: 1, g: 1, b: 1, a: 1}
+    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+    bottomRight: {r: 1, g: 1, b: 1, a: 1}
+  m_fontColorGradientPreset: {fileID: 0}
+  m_spriteAsset: {fileID: 0}
+  m_tintAllSprites: 0
+  m_overrideHtmlColors: 1
+  m_faceColor:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_outlineColor:
+    serializedVersion: 2
+    rgba: 4278190080
+  m_fontSize: 36
+  m_fontSizeBase: 36
+  m_fontWeight: 400
+  m_enableAutoSizing: 0
+  m_fontSizeMin: 18
+  m_fontSizeMax: 72
+  m_fontStyle: 0
+  m_textAlignment: 514
+  m_characterSpacing: 0
+  m_wordSpacing: 0
+  m_lineSpacing: 0
+  m_lineSpacingMax: 0
+  m_paragraphSpacing: 0
+  m_charWidthMaxAdj: 0
+  m_enableWordWrapping: 1
+  m_wordWrappingRatios: 0.4
+  m_overflowMode: 0
+  m_firstOverflowCharacterIndex: -1
+  m_linkedTextComponent: {fileID: 0}
+  m_isLinkedTextComponent: 0
+  m_isTextTruncated: 0
+  m_enableKerning: 1
+  m_enableExtraPadding: 0
+  checkPaddingRequired: 0
+  m_isRichText: 1
+  m_parseCtrlCharacters: 1
+  m_isOrthographic: 1
+  m_isCullingEnabled: 0
+  m_ignoreRectMaskCulling: 0
+  m_ignoreCulling: 1
+  m_horizontalMapping: 0
+  m_verticalMapping: 0
+  m_uvLineOffset: 0
+  m_geometrySortingOrder: 0
+  m_VertexBufferAutoSizeReduction: 1
+  m_firstVisibleCharacter: 0
+  m_useMaxVisibleDescender: 1
+  m_pageToDisplay: 1
+  m_margin: {x: 0.01589821, y: 0, z: -0.0054088864, w: 0}
+  m_textInfo:
+    textComponent: {fileID: 1888277886}
+    characterCount: 8
+    spriteCount: 0
+    spaceCount: 0
+    wordCount: 1
+    linkCount: 0
+    lineCount: 1
+    pageCount: 1
+    materialCount: 1
+  m_isUsingLegacyAnimationComponent: 0
+  m_isVolumetricText: 0
+  m_spriteAnimator: {fileID: 0}
+  m_hasFontAssetChanged: 0
+  m_subTextObjects:
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  m_baseMaterial: {fileID: 0}
+  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!222 &1888277887
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1888277884}
+  m_CullTransparentMesh: 0
 --- !u!1001 &1926950508
 PrefabInstance:
  m_ObjectHideFlags: 0

--- a/Assets/Scenes/Menu.unity
+++ b/Assets/Scenes/Menu.unity
@@ -1253,7 +1253,7 @@ MonoBehaviour:
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: c06ec8c82dca8d44797c31796c7242f8, type: 3}
+  m_Sprite: {fileID: 21300000, guid: dc2b986ef4f29d845a2646864edcf206, type: 3}
  m_Type: 0
  m_PreserveAspect: 0
  m_FillCenter: 1

--- a/Assets/Scripts/Automate.cs
+++ b/Assets/Scripts/Automate.cs
@@ -4,7 +4,6 @@ using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.UI;

-//UROBIT setters a getters!!!
 public class Automate : MonoBehaviour
 {
    private static List<string> moveList = new List<string>() { };
@@ -16,7 +15,6 @@ public class Automate : MonoBehaviour
    public GameObject ClickableRotator;
    public GameObject timeline;
    public Text algorithmMessage;
-    public static int actualPosition = 0;
    public static bool shuffleDone = false;
    public static bool AutomatePlaying = false;

@@ -25,7 +23,6 @@ public class Automate : MonoBehaviour

    private Vector3 targetVector;
    private float progressOfRotation;
-    private float speed = 300f;
    private float angle = 0;

    private string firstPhase = "Solve white face";
@@ -84,7 +81,6 @@ public class Automate : MonoBehaviour
                updateTimeline();
            }

-            //do the move at the first index;
            DoMove(actualMove);

        }
@@ -153,6 +149,7 @@ public class Automate : MonoBehaviour

    public void Shuffle()
    {
+        algorithmMessage.text = "";
        List<string> moves = new List<string>();
        int shuffleLength = UnityEngine.Random.Range(10, 30);
        for (int i = 0; i < shuffleLength; i++)

--- a/Assets/Scripts/CameraController.cs
+++ b/Assets/Scripts/CameraController.cs
@@ -7,7 +7,7 @@ public class CameraController : MonoBehaviour

    void Start()
    {
-        //cameraOrbit.position = Vector3.zero;
+
    }

    void Update()

--- a/Assets/Scripts/ColorButtons.cs
+++ b/Assets/Scripts/ColorButtons.cs
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using TMPro;
 using UnityEngine;
 using UnityEngine.UI;

@@ -13,7 +14,6 @@ public class ColorButtons : MonoBehaviour
    public Text errorTextOutput;

    public Material actualMaterial;
-    private Colors beforeButtonColor;
    private static bool colorsChanged = false;

    private string errorMassage = "You can't recolor middle pieces!";
@@ -66,7 +66,7 @@ public class ColorButtons : MonoBehaviour

    public void SwitchEditMode(bool toEdit = false)
    {
-        Text button = allButtons.transform.Find("Editation Button").Find("Text").GetComponent<Text>();
+        TMP_Text button = allButtons.transform.Find("Editation Button").Find("Text (TMP)").GetComponent<TMP_Text>();
        if (button.text == "Rotation" || toEdit)
        {
            button.text = "Editation";

--- a/Assets/Scripts/ColorsEnum.cs
+++ b/Assets/Scripts/ColorsEnum.cs
 using System.Collections;
 using System.Collections.Generic;
-//using UnityEngine;

 public enum Colors
 {

--- a/Assets/Scripts/CubeGroup.cs
+++ b/Assets/Scripts/CubeGroup.cs
@@ -6,11 +6,6 @@ using UnityEngine.Events;

 public class CubeGroup : MonoBehaviour
 {
-    private string draggedSide = "";
-    private int[,,] cubesSubcubes = new int[3, 3, 3] {
-        { { 16, 7, 25 }, { 15, 6, 24 }, { 17, 8, 26 } } ,
-        { { 10, 1, 19 } , { 9, 0, 18 } , { 11, 2, 20 } } ,
-        { { 13, 4, 22} , { 12, 3, 21} , {14, 5, 23 } } };

    float ZPosition;
    Vector3 Offset;

--- a/Assets/Scripts/CubeMap.cs
+++ b/Assets/Scripts/CubeMap.cs
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEngine.UI;
-
-public class CubeMap : MonoBehaviour
-{
-    CubeState cubeState;
-    private int numOfFaces;
-    private int numOfSquaresInRowMinusOne = 2;
-    List<Transform> sides;
-    //CubeMapMatrix cubeMapMatrix;
-    List<Face> cubeMapM;
-
-    public Transform up;
-    public Transform down;
-    public Transform left;
-    public Transform right;
-    public Transform front;
-    public Transform back;
-
-    public Material blue;
-    public Material green;
-    public Material red;
-    public Material orange;
-    public Material white;
-    public Material yellow;
-
-
-    // Start is called before the first frame update
-    void Start()
-    {
-        //cubeMapMatrix = new CubeMapMatrix();
-        //cubeMapMatrix.createMatrixAtStart();
-        
-        //cubeMapM = cubeMapMatrix.getCubeMap();
-        setNumberOfFaces();
-        addSidesToList();
-        Set();
-        //print("Start 2D");
-        //Colors c = cubeMapMatrix.getOnlyOneSquare(0, 0, 0);
-        //print(c);
-
-    }
-
-    private void addSidesToList()
-    {
-        sides = new List<Transform>();
-        sides.Add(up);
-        sides.Add(left);
-        sides.Add(front);
-        sides.Add(right);
-        sides.Add(back);
-        sides.Add(down);
-    }
-
-    private void setNumberOfFaces()
-    {
-        //numOfFaces = cubeMapMatrix.getNumberOfFaces();
-    }
-
-    // Update is called once per frame
-    void Update()
-    {
-        
-    }
-
-
-
-    public void Set()
-    {
-        cubeState = FindObjectOfType<CubeState>();
-        
-
-        //UpdateMap(cubeState.front, front);
-        //UpdateMap(cubeState.back, back);
-        //UpdateMap(cubeState.left, left);
-        //UpdateMap(cubeState.right, right);
-        //UpdateMap(cubeState.up, up);
-        //UpdateMap(cubeState.down, down);
-        
-        for (int i = 0; i < numOfFaces; i++)
-        {
-            //print("Som tu" + i);
-            UpdateMap(i,sides[i]);
-        }
-    }
-
-    void UpdateMap(int faceInCubeMap, Transform faceIn2DModel)
-    {
-        //print("Update!" + faceInCubeMap);
-        int i = 0;
-        int row = 0;
-        foreach(Transform square in faceIn2DModel)
-        {
-            //print(row);
-            Colors colorOfSquareInCubeMap = Colors.Blue;//cubeMapMatrix.getOnlyOneSquare(faceInCubeMap, row , i);
-
-            switch (colorOfSquareInCubeMap)
-            {
-                case Colors.Blue:
-                    square.GetComponent<Image>().color = blue.color;
-                    break;
-                case Colors.Green:
-                    square.GetComponent<Image>().color = green.color;
-                    break;
-                case Colors.Orange:
-                    square.GetComponent<Image>().color = orange.color;
-                    break;
-                case Colors.Red:
-                    square.GetComponent<Image>().color = red.color;
-                    break;
-                case Colors.White:
-                    square.GetComponent<Image>().color = white.color;
-                    break;
-                case Colors.Yellow:
-                    square.GetComponent<Image>().color = yellow.color;
-                    break;
-
-            };
-
-            //print(i + "i");
-            if (i % numOfSquaresInRowMinusOne == 0 && i != 0)
-            {
-                i = 0;
-                row++;
-
-            }
-            else
-                i++;
-
-
-
-        }
-
-        
-    }
-
-    
-}
--- a/Assets/Scripts/CubeMap.cs.meta
+++ b/Assets/Scripts/CubeMap.cs.meta
-fileFormatVersion: 2
-guid: 8d89c5df953f46f4aac3a8eb1bee95df
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Scripts/CubeSolvable.cs
+++ b/Assets/Scripts/CubeSolvable.cs
-using System.Collections;
-using System.Collections.Generic;
-
-
-public class CubeSolvable
-{
-    private string moveString;
-
-    public CubeSolvable(string moveString)
-    {
-        this.moveString = moveString;
-    }
-
-    public bool isCubeSovable()
-    {