From fe38db5f3786e1103b6da78925b2b688e4cd6065 Mon Sep 17 00:00:00 2001
From: Simon O'Shea <osheas1@wit.edu>
Date: Tue, 8 Aug 2023 12:31:23 -0400
Subject: [PATCH] ready for logan?

getting ready to piece UI elements together with the logic of the grid
---
 .../Assets/GridColorMaterials/MATERIAL.png    | Bin 1706 -> 1716 bytes
 .../Assets/Scenes/MainScene.unity             |  71 ++++++++++++++++-
 .../Assets/Scripts/CellMesh.cs                |  74 +++++++-----------
 Pathfinding Visualizer/Assets/Scripts/Main.cs |  56 +++++++++----
 4 files changed, 137 insertions(+), 64 deletions(-)

diff --git a/Pathfinding Visualizer/Assets/GridColorMaterials/MATERIAL.png b/Pathfinding Visualizer/Assets/GridColorMaterials/MATERIAL.png
index b660f24a804d5c9279fa120c216c138d9f100914..58de9aeba67d37a7f7d99c330a0cbb3001412635 100644
GIT binary patch
delta 601
zcmZ3*yM<S^Gr-TCmrII^fq{Y7)59eQNDBZlBL@?ZjF8^R!N9<>VWR5q$^MM`lNErt
zj`7OmD@<ZchGvsrGg%0iWTvHAdFCdjr-o;ylw{Z{0mXfplqR<^X)qZZOy0mG#bRt=
zpg&obIg{Pg%EZXZ*nDy?vnHIqmw73ioyn5N(y-nC$K=~A^7XsDnH>e%?S)kzF|!6o
zM6h&*X-O$&Bu{+6eMM>BgVj6dOm{i)ct^L#2GJZ=){Do&7uGj!Yuc)y(WS60O8eG|
zImK}bj%Rc>e}0=^-gY<ggGQ!qa_Dy_wb|y$izgm<bEoFOcOPB5s22y;XH7G-v|SW%
z(eB-fqDQ{lgI9mrS--Zf-gCRjidCX=mw1fzZPaWw&N7#|C-yB{v()oP$d1!fxVi3I
zRo!_i-ac8c-ZDpPqejK7R_2pNebYBiGcrE(si<k@m#(lq{hueX*;*UxZj9Z-+byx!
zg~Q;SLExb;h8o2)@|?b$=;HdhcmL1eCo18SZ!Ty!Y2+F7<fTxl>#Em6!i(x(8(k8a
z^Y8!L)l*;a@4PCl6!1CacE0R`+fDC%Z~wE|^7g&*2fIVA+osI7ZfGpOXzm?VAV2Hc
z!#A6j94&uP!yF~gb2X%1b^Q+Yi4E6<Gv+i;%U%&(P#t#X`471%raxC{-?-cCXL*0i
z59YYW^hXP{1$P0Xo3p?pvY3HEPZ@}<l^H9R+Lr-EWj$RSLpWw8|M~mdoS8>LQu5%<
jJF@p5ym987{~(9qhB3PuGjGUzph5;uS3j3^P6<r_FmLwm

delta 587
zcmdnOyNXw}Gr-TCmrII^fq{Y7)59eQNV5PjBL@?ZEQ^~l3&>wLQT6v^e@6Yu3P4=P
zcxCb~CRtw3+{E<M@XVBw3|l3W$!D32m<)|3GcrrD8X6hs8&39Rl4dlSoW*1@S(Q1N
z-Pp>+(#qImazC>soV}lUDV&|nlE>0iS9xdhT^9NJ{oYQ2BFF8s7JgywmXeZES><_{
zYsoaWr8+CvOiyH8oNmulZ*wo$DXKYap+eTn>jCwSYaNRPL|g^dnu>3ovgh3C106Qg
zi_br=dvDubeV#R2WpT<^HvN=hR$Y-VyPqxQ*845Y_h!rEqe8(YrD`^U3)k(vpJe!W
z>+v<A|L^R-wx@p11<?%_EyqPdwK@E`{MU<xOy1sNJ+&k!@`uZfwI^9y^L=dNo~BO@
z4*h2m+1<jFkSkoaw65@vxOS$lwvPUC^VynO_TLTTFHJgewpI08NBLr5r4D)V;2z-v
z#}yVE{r+HZq+!j9$?yN3o3E<Bv+InOs!5o~#AOZ9R~Ci%d-!zK&zmrDVam7v`SD+$
zd<fWD)h#b2&--{Q|C`wXn$pLPHztPg9sI`dd}mZ$oxIyU7yav7?%5WsJN(ksw>$sv
zO}3J|s||I(>E1lD_N2-l8Ru*ft91)9H{RMjzqaq4!X~x&QcmmL7xbUc^^W&gnttPC
z-E<dVL~|B+L>4nJ2$cY_aS7wSH2DgksHmrlV+hC0<dlSjAAf&uf2-H4di)Bb!bjG{
UD|a+X0TnQKy85}Sb4q9e0L;qlp8x;=

diff --git a/Pathfinding Visualizer/Assets/Scenes/MainScene.unity b/Pathfinding Visualizer/Assets/Scenes/MainScene.unity
index fa0a3ec..6fb686c 100644
--- a/Pathfinding Visualizer/Assets/Scenes/MainScene.unity	
+++ b/Pathfinding Visualizer/Assets/Scenes/MainScene.unity	
@@ -138,7 +138,7 @@ GameObject:
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
+  m_StaticEditorFlags: 2147483647
   m_IsActive: 1
 --- !u!114 &144141394
 MonoBehaviour:
@@ -356,6 +356,74 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1473159508}
   m_Mesh: {fileID: 0}
+--- !u!1 &1836453007
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1836453010}
+  - component: {fileID: 1836453009}
+  - component: {fileID: 1836453008}
+  m_Layer: 0
+  m_Name: EventSystem
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1836453008
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1836453007}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_SendPointerHoverToParent: 1
+  m_HorizontalAxis: Horizontal
+  m_VerticalAxis: Vertical
+  m_SubmitButton: Submit
+  m_CancelButton: Cancel
+  m_InputActionsPerSecond: 10
+  m_RepeatDelay: 0.5
+  m_ForceModuleActive: 0
+--- !u!114 &1836453009
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1836453007}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_FirstSelected: {fileID: 0}
+  m_sendNavigationEvents: 1
+  m_DragThreshold: 10
+--- !u!4 &1836453010
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1836453007}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1660057539 &9223372036854775807
 SceneRoots:
   m_ObjectHideFlags: 0
@@ -363,3 +431,4 @@ SceneRoots:
   - {fileID: 144141395}
   - {fileID: 519420032}
   - {fileID: 1473159510}
+  - {fileID: 1836453010}
diff --git a/Pathfinding Visualizer/Assets/Scripts/CellMesh.cs b/Pathfinding Visualizer/Assets/Scripts/CellMesh.cs
index 5fc6bd8..2b30d2f 100644
--- a/Pathfinding Visualizer/Assets/Scripts/CellMesh.cs	
+++ b/Pathfinding Visualizer/Assets/Scripts/CellMesh.cs	
@@ -7,6 +7,10 @@ public class CellMesh : MonoBehaviour
     private LogicGrid grid;
     private Mesh mesh;
 
+    Vector3[] m_vertices;
+    Vector2[] m_uv;
+    int[] m_triangles;
+
     private void Awake()
     {
         mesh = new Mesh();
@@ -24,12 +28,30 @@ public class CellMesh : MonoBehaviour
 
     private void GridValueChanged(object sender, LogicGrid.OnGridValueChangedEventArgs e)
     {
-        Debug.Log("FIRE!!");
+        Debug.Log(e.x + " " + e.y);
         UpdateCellVisual();
     }
 
+    // TODO: implement this so we can update a single cell, given an x, y coordinate
+    private void UpdateCellVisual(int x, int y)
+    {
+        //Debug.Log("Updated in Isolation 8)");
+        Vector3 quadSize = new Vector3(1, 1) * grid.GetCellSize();
+        int index = x * grid.GetHeight() + y;
+
+        int gridValue = grid.GetValue(x, y);
+        float gridValueNormalized = gridValue / 3f;
+        Vector2 gridValueUV = new Vector2(gridValueNormalized, 0f);
+
+        MeshUtils.AddToMeshArrays(m_vertices, m_uv, m_triangles, index, grid.GetWorldPosition(x, y) + (quadSize * .5f), 0f, quadSize, gridValueUV, gridValueUV);
+
+    }
+
+    // Update all cells at once
     private void UpdateCellVisual()
     {
+        Debug.Log("Updated as a group");
+
         MeshUtils.CreateEmptyMeshArrays(grid.GetWidth() * grid.GetHeight(), out Vector3[] vertices, out Vector2[] uv, out int[] triangles);
 
         for(int x = 0; x < grid.GetWidth(); x++)
@@ -40,13 +62,17 @@ public class CellMesh : MonoBehaviour
                 Vector3 quadSize = new Vector3(1, 1) * grid.GetCellSize();
 
                 int gridValue = grid.GetValue(x, y);
-                float gridValueNormalized = gridValue / 4f;
+                float gridValueNormalized = gridValue / 3f;
                 Vector2 gridValueUV = new Vector2(gridValueNormalized, 0f);
                 
                 
                 MeshUtils.AddToMeshArrays(vertices, uv, triangles, index, grid.GetWorldPosition(x, y) + (quadSize * .5f), 0f, quadSize, gridValueUV, gridValueUV);
             }
 
+        m_vertices = vertices;
+        m_uv = uv;
+        m_triangles = triangles;
+
         mesh.vertices = vertices;
         mesh.uv = uv;
         mesh.triangles = triangles;
@@ -57,52 +83,8 @@ public class CellMesh : MonoBehaviour
         
     }
 
-
-    /*                MeshRenderer myRenderer = GetComponent<MeshRenderer>();
-                Material m_material;
-                if (myRenderer != null)
-                {
-                    m_material = myRenderer.material;
-
-                    if(gridValue == -1)
-                    {
-                        m_material.color = Color.black; 
-                    }
-                    if (gridValue == 0)
-                    {
-                        m_material.color = Color.white;
-                    }
-                    if (gridValue == 1)
-                    {
-                        m_material.color = Color.green;
-                    }
-                    if (gridValue == 2)
-                    {
-                        m_material.color = Color.cyan;
-                    }*//*
-                }
-*/
     private void Update()
     {
-/*        if(Input.GetKeyDown("1"))
-        {
-            Debug.Log("1");
-            m_Material.color = Color.white;
-            //m_Material.SetColor("_Color", Color.white);
-        }
 
-        if (Input.GetKeyDown("2"))
-        {
-            Debug.Log("2");
-            m_Material.color = Color.black;
-            //m_Material.SetColor("_Color", Color.white);
-        }
-
-        if (Input.GetKeyDown("3"))
-        {
-            Debug.Log("3");
-            m_Material.color = Color.green;
-            //m_Material.SetColor("_Color", Color.white);
-        }*/
     }
 }
diff --git a/Pathfinding Visualizer/Assets/Scripts/Main.cs b/Pathfinding Visualizer/Assets/Scripts/Main.cs
index cdc64db..fcac001 100644
--- a/Pathfinding Visualizer/Assets/Scripts/Main.cs	
+++ b/Pathfinding Visualizer/Assets/Scripts/Main.cs	
@@ -16,10 +16,10 @@ public class Main : MonoBehaviour
     void Start()
     {
         // Create world
-        world = new LogicGrid(5, 5, 10f, new Vector3(0, 0));
+        world = new LogicGrid(100, 100, 5f, new Vector3(-110, -110));
         
         // Set default placement to Obstacle
-        placementValue = -1;
+        placementValue = 1;
         placementMode = 'o';
 
         cellMesh.SetGrid(world);
@@ -32,38 +32,43 @@ public class Main : MonoBehaviour
     void Update()
     {
         // Change Placement Modes:
-        // Place Agent in grid
-        // TODO change modes via UI button
-        if(Input.GetKeyDown("a"))
+
+        // Place Obstacle in grid
+        if (Input.GetKeyDown("o"))
         {
-            Debug.Log("Placing Mode: Agent");
-            placementMode = 'a';
-            placementValue = 3;
+            Debug.Log("Placing Mode: Obstacle");
+            placementMode = 'o';
+            placementValue = 1;
         }
-        // Place Sample in grid
+        // Place Sample in cell
         if(Input.GetKeyDown("s"))
         {
             Debug.Log("Placing Mode: Sample");
             placementMode = 's';
             placementValue = 2;
         }
-        // Place Obstacle in grid
-        if(Input.GetKeyDown("o"))
+        // Place agent in cell
+        if (Input.GetKeyDown("a"))
         {
-            Debug.Log("Placing Mode: Obstacle");
-            placementMode = 'o';
-            placementValue = 1;
+            Debug.Log("Placing Mode: Agent");
+            placementMode = 'a';
+            placementValue = 3;
+        }
+        // Reset Canvas
+        if (Input.GetKeyDown("r"))
+        {
+
         }
 
-        
+
         // Update Cell:
         // Change cell to obstacle
-        if (Input.GetMouseButtonDown(0))
+        if (Input.GetMouseButton(0))
         {
             world.SetValue(CodeMonkey.Utils.UtilsClass.GetMouseWorldPosition(), placementValue);
         }
         // Clear cell
-        if (Input.GetMouseButtonDown(1))
+        if (Input.GetMouseButton(1))
         {
             world.SetValue(CodeMonkey.Utils.UtilsClass.GetMouseWorldPosition(), 0);
         }
@@ -73,4 +78,21 @@ public class Main : MonoBehaviour
             // and perform the selected algorithm
 
     }
+
+
+    public void SetModeObstacle()
+    {
+        placementValue = 1;
+    }
+    public void SetModeSample()
+    {
+        placementValue = 2;
+    }
+
+    public void SetModeAgent()
+    {
+        placementValue = 3;
+    }
+
+
 }