updated ECSSamples package dependencies

Author: davidv-unity

ECSSamples/Assets/Advanced/GridPath/Scenes/GridCube.unity renamed to ECSSamples/Assets/Advanced/GridPath/GridCube.unity

@@ -150,7 +150,6 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 7238b95470734819b4a9ba11900739a2, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
- Version: 4-macton-2
  RowCount: 32
  FloorPrefab:
  - {fileID: 6226756458611596980, guid: fa9e694a0208e45c48a1c607230cd068, type: 3}

ECSSamples/Assets/Advanced/GridPath/Scenes/GridCube.unity.meta renamed to ECSSamples/Assets/Advanced/GridPath/GridCube.unity.meta

@@ -150,7 +150,6 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: d3b7dec172b34d219fd0799d314645e5, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
- Version: 4-macton-9
  ColumnCount: 128
  RowCount: 32
  FloorPrefab:

ECSSamples/Assets/Advanced/GridPath/Scenes/GridPlane.unity renamed to ECSSamples/Assets/Advanced/GridPath/GridPlane.unity

@@ -0,0 +1,44 @@
+using System;
+using Unity.Entities;
+using Unity.Mathematics;
+
+// Direction along grid axis
+// 0 = N
+// 1 = S
+// 2 = W
+// 3 = E
+public struct CartesianGridDirection : IComponentData
+{
+ public byte Value; // 2 bits current direction
+}
+
+// Speed of movement in grid-space
+// - 6:10 fixed point instead of 32bit float (for size)
+public struct CartesianGridSpeed : IComponentData
+{
+ public ushort Value; 
+}
+
+// Coordinates quantized to the grid
+public struct CartesianGridCoordinates : IComponentData, IEquatable<CartesianGridCoordinates>
+{
+ public short x;
+ public short y;
+ 
+ public CartesianGridCoordinates(float2 pos, int rowCount, int colCount)
+ {
+ // Quantized grid coordinates from position in grid space
+ // - Always positive when on the grid. (Up, Right)
+ // - Basically just float to int cast.
+ // - However, in the case of a cube, the translation may go off the grid when travelling around the corner.
+ // In this case, stretch the one-off grid element to encompass the whole area off the grid.
+ // e.g. if it's off to the left, grid x value is always -1.
+ x = (short)math.clamp(((int)(pos.x + 1.0f)) - 1, -1, colCount);
+ y = (short)math.clamp(((int)(pos.y + 1.0f)) - 1, -1, rowCount);
+ }
+ 
+ public bool Equals(CartesianGridCoordinates other)
+ {
+ return ((other.x == x) && (other.y == y));
+ }
+}

ECSSamples/Assets/Advanced/GridPath/Scenes/GridPlane.unity.meta renamed to ECSSamples/Assets/Advanced/GridPath/GridPlane.unity.meta

@@ -0,0 +1,162 @@
+using Unity.Burst;
+using Unity.Collections;
+using Unity.Collections.LowLevel.Unsafe;
+using Unity.Entities;
+using Unity.Jobs;
+using Unity.Mathematics;
+using Unity.Transforms;
+using UnityEngine;
+
+public static class CartesianGridGeneratorUtility
+{
+ public enum WallFlags : byte
+ {
+ SouthWall = 1,
+ WestWall = 2,
+ }
+ 
+ public static unsafe void CreateGridPath(int rowCount, int columnCount, byte* gridWalls, float wallSProbability, float wallWProbability, bool outerWalls)
+ {
+ var buildGridPathJob = new BuildGridPath
+ {
+ GridWalls = gridWalls,
+ RowCount = rowCount,
+ ColumnCount = columnCount,
+ WallSProbability = wallSProbability,
+ WallWProbability = wallWProbability,
+ OuterWalls = outerWalls
+ };
+ buildGridPathJob.Run();
+ }
+
+ [BurstCompile]
+ unsafe struct BuildGridPath : IJob
+ {
+ [NativeDisableUnsafePtrRestriction]
+ public byte* GridWalls;
+ public int RowCount;
+ public int ColumnCount;
+ public float WallSProbability;
+ public float WallWProbability;
+ public bool OuterWalls;
+
+ public void Execute()
+ {
+ var cx = (ColumnCount * 0.5f);
+ var cz = (RowCount * 0.5f);
+
+ // Add additional row/col to create SE walls along outer edge
+ var GridWallsRowCount = RowCount + 1;
+ var GridWallsColumnCount = ColumnCount + 1;
+ 
+ // 2 bit (0=None, 1=South Wall, 2=West Wall)
+ // Temp allocations in jobs auto-disposed
+ var GridWallsSW = new NativeArray<byte>(GridWallsRowCount * GridWallsColumnCount, Allocator.Temp);
+ 
+ // Populate the grid
+ for (int y = 0; y < GridWallsRowCount; y++)
+ for (int x = 0; x < GridWallsColumnCount; x++)
+ {
+ // By default place outer walls along the edge of the grid.
+ if ((y == 0) && (x < (GridWallsColumnCount - 1)))
+ GridWallsSW[(y * GridWallsColumnCount) + x] |= (byte)WallFlags.SouthWall;
+ if ((x == 0) && (y < (GridWallsRowCount - 1)))
+ GridWallsSW[(y * GridWallsColumnCount) + x] |= (byte)WallFlags.WestWall;
+ if ((y == (GridWallsRowCount - 1)) && (x < (GridWallsColumnCount - 1)))
+ GridWallsSW[(y * GridWallsColumnCount) + x] |= (byte)WallFlags.SouthWall;
+ if ((x == (GridWallsColumnCount - 1)) && (y < (GridWallsRowCount - 1)))
+ GridWallsSW[(y * GridWallsColumnCount) + x] |= (byte)WallFlags.WestWall;
+
+ if ((x < (GridWallsColumnCount - 1)) && (y < (GridWallsRowCount - 1)))
+ {
+ var tx = ((float)x) - cx;
+ var tz = ((float)y) - cz;
+
+ var n0 = noise.snoise(new float2(tx * 1.2345f, tz * 1.2345f));
+ var n1 = noise.snoise(new float2(tz * 1.6789f, tx * 1.6789f));
+
+ if (((n0 * 0.5f) + 0.5f) < WallSProbability)
+ GridWallsSW[(y * GridWallsColumnCount) + x] |= (byte)WallFlags.SouthWall;
+ if (((n1 * 0.5f) + 0.5f) < WallWProbability)
+ GridWallsSW[(y * GridWallsColumnCount) + x] |= (byte)WallFlags.WestWall;
+ }
+
+ // Make sure there are no outer walls along the edge of the grid
+ if (!OuterWalls)
+ {
+ if (x == 0)
+ GridWallsSW[(y * GridWallsColumnCount) + x] &= (byte)~WallFlags.WestWall;
+ if (x == (GridWallsColumnCount - 1))
+ GridWallsSW[(y * GridWallsColumnCount) + x] &= (byte)~WallFlags.WestWall;
+ if (y == (GridWallsRowCount - 1))
+ GridWallsSW[(y * GridWallsColumnCount) + x] &= (byte)~WallFlags.SouthWall;
+ if (y == 0)
+ GridWallsSW[(y * GridWallsColumnCount) + x] &= (byte)~WallFlags.SouthWall;
+ }
+ }
+
+ for (int y = 0; y < RowCount; y++)
+ for (int x = 0; x < ColumnCount; x++)
+ {
+ var wallN = ((GridWallsSW[((y + 1) * GridWallsColumnCount) + x] & (byte)WallFlags.SouthWall) != 0);
+ var wallS = ((GridWallsSW[(y * GridWallsColumnCount) + x] & (byte)WallFlags.SouthWall) != 0);
+ var wallW = ((GridWallsSW[(y * GridWallsColumnCount) + x] & (byte)WallFlags.WestWall) != 0);
+ var wallE = ((GridWallsSW[(y * GridWallsColumnCount) + (x + 1)] & (byte)WallFlags.WestWall) != 0);
+ var walls = ((wallN) ? 0x01 : 0x00)
+ | ((wallS) ? 0x02 : 0x00)
+ | ((wallW) ? 0x04 : 0x00)
+ | ((wallE) ? 0x08 : 0x00);
+
+ var gridWallIndex = (y * ((ColumnCount+1)/2)) + (x / 2);
+ walls <<= (x & 1) * 4; // odd columns packed into upper 4 bits
+ walls |= GridWalls[gridWallIndex];
+ GridWalls[gridWallIndex] = (byte)walls;
+ }
+ }
+ }
+ 
+ public static void CreateFloorPanel(EntityManager dstManager, Entity prefab, float4x4 parentLocalToWorld, float tx, float tz)
+ {
+ var pos = new float3(tx + 0.5f, 0.0f, tz + 0.5f);
+ var childLocalToParent = math.mul(float4x4.Translate(pos), float4x4.Scale(0.98f));
+ var localToWorld = new LocalToWorld
+ {
+ Value = math.mul(parentLocalToWorld,childLocalToParent)
+ };
+ 
+ CreatePanel(dstManager, prefab, localToWorld);
+ }
+ 
+ public static void CreateWallS(EntityManager dstManager, Entity prefab, float4x4 parentLocalToWorld, float tx, float tz)
+ {
+ var pos = new float3(tx + 0.5f, 1.0f, tz); 
+ var childLocalToParent = math.mul(float4x4.Translate(pos), float4x4.Scale(1.1f, 1.1f, 0.1f));
+ var localToWorld = new LocalToWorld
+ {
+ Value = math.mul(parentLocalToWorld,childLocalToParent)
+ };
+ 
+ CreatePanel(dstManager, prefab, localToWorld);
+ }
+ 
+ public static void CreateWallW(EntityManager dstManager, Entity prefab, float4x4 parentLocalToWorld, float tx, float tz)
+ {
+ var pos = new float3(tx, 1.0f, tz + 0.5f);
+ var childLocalToParent = math.mul(float4x4.Translate(pos), float4x4.Scale(0.1f, 1.1f, 1.1f));
+ var localToWorld = new LocalToWorld
+ {
+ Value = math.mul(parentLocalToWorld,childLocalToParent)
+ };
+
+ CreatePanel(dstManager, prefab, localToWorld);
+ }
+ 
+ public static void CreatePanel(EntityManager dstManager, Entity prefab, LocalToWorld localToWorld)
+ {
+ var panelEntity = dstManager.Instantiate(prefab);
+ 
+ dstManager.RemoveComponent<Translation>(panelEntity);
+ dstManager.RemoveComponent<Rotation>(panelEntity);
+ dstManager.SetComponentData(panelEntity, localToWorld);
+ }
+}