@@ -1,4 +1,3 @@
-using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 
@@ -9,37 +8,35 @@ namespace SpatialPartition.Grid
 public class GameController : MonoBehaviour
 {
 //Drags
-public GameObject battlefieldObj;
-
 public Unit unitPrefab;
 
 public Transform unitParentTrans;
 
 //Private
 private Grid grid;
 
-//The number of units we start with
+//The number of units moving on the map
 private const int NUMBER_OF_UNITS = 100;
 
 //To keep track of all units so we can move them
 private HashSet<Unit> allUnits = new HashSet<Unit>();
 
+//Display the grid with lines
+
+//Grid material
+private Material gridMaterial;
+
+//Grid mesh
+private Mesh gridMesh;
+
 
 
 void Start()
 {
 grid = new Grid();
 
-
-//Make the battlefield the same size as the grid
 float battlefieldWidth = Grid.NUM_CELLS * Grid.CELL_SIZE;
 
-battlefieldObj.transform.localScale = new Vector3(battlefieldWidth, 1f, battlefieldWidth);
-
-//The grid starts at origo, so we need to change position as well
-battlefieldObj.transform.position = new Vector3(battlefieldWidth * 0.5f, 0f, battlefieldWidth * 0.5f);
-
-
 //Add units within the grid at random positions
 for (int i = 0; i < NUMBER_OF_UNITS; i++)
 {
@@ -70,5 +67,75 @@ void Update()
 //Units attack each other
 grid.HandleMelee();
 }
+
+
+
+private void LateUpdate()
+{
+//Display the grid with lines
+if (gridMaterial == null)
+{
+gridMaterial = new Material(Shader.Find("Unlit/Color"));
+
+gridMaterial.color = Color.black;
+}
+
+if (grid == null)
+{
+return;
+}
+
+if (gridMesh == null)
+{
+gridMesh = InitGridMesh();
+}
+
+//Display the mesh
+Graphics.DrawMesh(gridMesh, Vector3.zero, Quaternion.identity, gridMaterial, 0, Camera.main, 0);
+}
+
+
+
+private Mesh InitGridMesh()
+{
+//Generate the vertices
+List<Vector3> lineVertices = new ();
+
+float battlefieldWidth = Grid.NUM_CELLS * Grid.CELL_SIZE;
+
+Vector3 linePosX = Vector3.zero;
+Vector3 linePosY = Vector3.zero;
+
+for (int x = 0; x <= Grid.NUM_CELLS; x++)
+{
+lineVertices.Add(linePosX);
+lineVertices.Add(linePosX + Vector3.right * battlefieldWidth);
+
+lineVertices.Add(linePosY);
+lineVertices.Add(linePosY + Vector3.forward * battlefieldWidth);
+
+linePosX += Vector3.forward * Grid.CELL_SIZE;
+linePosY += Vector3.right * Grid.CELL_SIZE;
+}
+
+
+//Generate the indices
+List<int> indices = new ();
+
+for (int i = 0; i < lineVertices.Count; i++)
+{
+indices.Add(i);
+}
+
+
+//Generate the mesh
+Mesh gridMesh = new ();
+
+gridMesh.SetVertices(lineVertices);
+gridMesh.SetIndices(indices, MeshTopology.Lines, 0);
+
+
+return gridMesh;
+}
 }
 }

@@ -43,7 +43,7 @@ RenderSettings:
 --- !u!157 &3
 LightmapSettings:
 m_ObjectHideFlags: 0
-serializedVersion: 11
+serializedVersion: 12
 m_GIWorkflowMode: 0
 m_GISettings:
 serializedVersion: 2
@@ -54,14 +54,15 @@ LightmapSettings:
 m_EnableBakedLightmaps: 1
 m_EnableRealtimeLightmaps: 1
 m_LightmapEditorSettings:
-serializedVersion: 10
+serializedVersion: 12
 m_Resolution: 2
 m_BakeResolution: 40
 m_AtlasSize: 1024
 m_AO: 0
 m_AOMaxDistance: 1
 m_CompAOExponent: 1
 m_CompAOExponentDirect: 0
+m_ExtractAmbientOcclusion: 0
 m_Padding: 2
 m_LightmapParameters: {fileID: 0}
 m_LightmapsBakeMode: 1
@@ -76,20 +77,29 @@ LightmapSettings:
 m_PVRDirectSampleCount: 32
 m_PVRSampleCount: 500
 m_PVRBounces: 2
+m_PVREnvironmentSampleCount: 500
+m_PVREnvironmentReferencePointCount: 2048
+m_PVRFilteringMode: 2
+m_PVRDenoiserTypeDirect: 0
+m_PVRDenoiserTypeIndirect: 0
+m_PVRDenoiserTypeAO: 0
 m_PVRFilterTypeDirect: 0
 m_PVRFilterTypeIndirect: 0
 m_PVRFilterTypeAO: 0
-m_PVRFilteringMode: 1
+m_PVREnvironmentMIS: 0
 m_PVRCulling: 1
 m_PVRFilteringGaussRadiusDirect: 1
 m_PVRFilteringGaussRadiusIndirect: 5
 m_PVRFilteringGaussRadiusAO: 2
 m_PVRFilteringAtrousPositionSigmaDirect: 0.5
 m_PVRFilteringAtrousPositionSigmaIndirect: 2
 m_PVRFilteringAtrousPositionSigmaAO: 1
-m_ShowResolutionOverlay: 1
+m_ExportTrainingData: 0
+m_TrainingDataDestination: TrainingData
+m_LightProbeSampleCountMultiplier: 4
 m_LightingDataAsset: {fileID: 0}
-m_UseShadowmask: 1
+m_LightingSettings: {fileID: 4890085278179872738, guid: e997a83e1f1b5d64baa705f6789eaa95,
+type: 2}
 --- !u!196 &4
 NavMeshSettings:
 serializedVersion: 2
@@ -109,86 +119,11 @@ NavMeshSettings:
 manualTileSize: 0
 tileSize: 256
 accuratePlacement: 0
+maxJobWorkers: 0
+preserveTilesOutsideBounds: 0
 debug:
 m_Flags: 0
 m_NavMeshData: {fileID: 0}
---- !u!1 &401042762
-GameObject:
-m_ObjectHideFlags: 0
-m_CorrespondingSourceObject: {fileID: 0}
-m_PrefabInstance: {fileID: 0}
-m_PrefabAsset: {fileID: 0}
-serializedVersion: 6
-m_Component:
-- component: {fileID: 401042766}
-- component: {fileID: 401042765}
-- component: {fileID: 401042764}
-m_Layer: 0
-m_Name: Battlefield
-m_TagString: Untagged
-m_Icon: {fileID: 0}
-m_NavMeshLayer: 0
-m_StaticEditorFlags: 0
-m_IsActive: 1
---- !u!23 &401042764
-MeshRenderer:
-m_ObjectHideFlags: 0
-m_CorrespondingSourceObject: {fileID: 0}
-m_PrefabInstance: {fileID: 0}
-m_PrefabAsset: {fileID: 0}
-m_GameObject: {fileID: 401042762}
-m_Enabled: 1
-m_CastShadows: 1
-m_ReceiveShadows: 1
-m_DynamicOccludee: 1
-m_MotionVectors: 1
-m_LightProbeUsage: 1
-m_ReflectionProbeUsage: 1
-m_RenderingLayerMask: 1
-m_RendererPriority: 0
-m_Materials:
-- {fileID: 2100000, guid: ea86c1b73dd97f04f9da616aff12971d, type: 2}
-m_StaticBatchInfo:
-firstSubMesh: 0
-subMeshCount: 0
-m_StaticBatchRoot: {fileID: 0}
-m_ProbeAnchor: {fileID: 0}
-m_LightProbeVolumeOverride: {fileID: 0}
-m_ScaleInLightmap: 1
-m_PreserveUVs: 0
-m_IgnoreNormalsForChartDetection: 0
-m_ImportantGI: 0
-m_StitchLightmapSeams: 0
-m_SelectedEditorRenderState: 3
-m_MinimumChartSize: 4
-m_AutoUVMaxDistance: 0.5
-m_AutoUVMaxAngle: 89
-m_LightmapParameters: {fileID: 0}
-m_SortingLayerID: 0
-m_SortingLayer: 0
-m_SortingOrder: 0
---- !u!33 &401042765
-MeshFilter:
-m_ObjectHideFlags: 0
-m_CorrespondingSourceObject: {fileID: 0}
-m_PrefabInstance: {fileID: 0}
-m_PrefabAsset: {fileID: 0}
-m_GameObject: {fileID: 401042762}
-m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
---- !u!4 &401042766
-Transform:
-m_ObjectHideFlags: 0
-m_CorrespondingSourceObject: {fileID: 0}
-m_PrefabInstance: {fileID: 0}
-m_PrefabAsset: {fileID: 0}
-m_GameObject: {fileID: 401042762}
-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: 0}
-m_RootOrder: 3
-m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &826587778
 GameObject:
 m_ObjectHideFlags: 0
@@ -199,7 +134,7 @@ GameObject:
 m_Component:
 - component: {fileID: 826587779}
 m_Layer: 0
-m_Name: Units
+m_Name: Units parent
 m_TagString: Untagged
 m_Icon: {fileID: 0}
 m_NavMeshLayer: 0
@@ -215,9 +150,10 @@ Transform:
 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_RootOrder: 4
+m_RootOrder: 3
 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1033359570
 GameObject:
@@ -244,12 +180,14 @@ Light:
 m_PrefabAsset: {fileID: 0}
 m_GameObject: {fileID: 1033359570}
 m_Enabled: 1
-serializedVersion: 8
+serializedVersion: 10
 m_Type: 1
+m_Shape: 0
 m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
 m_Intensity: 1
 m_Range: 10
 m_SpotAngle: 30
+m_InnerSpotAngle: 21.80208
 m_CookieSize: 10
 m_Shadows:
 m_Type: 2
@@ -259,19 +197,41 @@ Light:
 m_Bias: 0.05
 m_NormalBias: 0.4
 m_NearPlane: 0.2
+m_CullingMatrixOverride:
+e00: 1
+e01: 0
+e02: 0
+e03: 0
+e10: 0
+e11: 1
+e12: 0
+e13: 0
+e20: 0
+e21: 0
+e22: 1
+e23: 0
+e30: 0
+e31: 0
+e32: 0
+e33: 1
+m_UseCullingMatrixOverride: 0
 m_Cookie: {fileID: 0}
 m_DrawHalo: 0
 m_Flare: {fileID: 0}
 m_RenderMode: 0
 m_CullingMask:
 serializedVersion: 2
 m_Bits: 4294967295
+m_RenderingLayerMask: 1
 m_Lightmapping: 4
 m_LightShadowCasterMode: 0
 m_AreaSize: {x: 1, y: 1}
 m_BounceIntensity: 1
 m_ColorTemperature: 6570
 m_UseColorTemperature: 0
+m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
+m_UseBoundingSphereOverride: 0
+m_UseViewFrustumForShadowCasterCull: 1
 m_ShadowRadius: 0
 m_ShadowAngle: 0
 --- !u!4 &1033359572
@@ -284,6 +244,7 @@ Transform:
 m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
 m_LocalPosition: {x: 0, y: 500, z: 0}
 m_LocalScale: {x: 1, y: 1, z: 1}
+m_ConstrainProportionsScale: 0
 m_Children: []
 m_Father: {fileID: 0}
 m_RootOrder: 1
@@ -326,9 +287,10 @@ Camera:
 m_ClearFlags: 1
 m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
 m_projectionMatrixMode: 1
+m_GateFitMode: 2
+m_FOVAxisMode: 0
 m_SensorSize: {x: 36, y: 24}
 m_LensShift: {x: 0, y: 0}
-m_GateFitMode: 2
 m_FocalLength: 50
 m_NormalizedViewPortRect:
 serializedVersion: 2
@@ -366,6 +328,7 @@ Transform:
 m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
 m_LocalPosition: {x: 25, y: 765, z: 25}
 m_LocalScale: {x: 1, y: 1, z: 1}
+m_ConstrainProportionsScale: 0
 m_Children: []
 m_Father: {fileID: 0}
 m_RootOrder: 0
@@ -397,6 +360,7 @@ Transform:
 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_RootOrder: 2
@@ -413,7 +377,6 @@ MonoBehaviour:
 m_Script: {fileID: 11500000, guid: a5b106aed7d115048a91fdfcbb84005a, type: 3}
 m_Name:
 m_EditorClassIdentifier:
-battlefieldObj: {fileID: 401042762}
 unitPrefab: {fileID: 6404582697255075593, guid: c2075d714081c9944b2ae26c74b36e85,
 type: 3}
 unitParentTrans: {fileID: 826587779}