Skip to content

Commit c13d4eb

Browse files
BrianWill-UnityDOTS Publisherdavidv-unity
authored andcommitted
Publishing samples for Entities 0.16
* Publishing samples for Entities 0.16 Co-authored-by: DOTS Publisher <noreply@unity3d.com> Co-authored-by: davidv-unity <davidv@unity3d.com>
1 parent 7354d6b commit c13d4eb

32 files changed

Lines changed: 132 additions & 132 deletions

.gitignore

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -39,20 +39,12 @@ PerformanceTestRunInfo.json
3939
PerformanceTestRunInfo.json.meta
4040

4141
**/InitTestScene*
42-
Samples/Logs/*
43-
42+
**/Logs
4443
Bootstrap/
45-
46-
BootstrapSamples/Logs/*
47-
48-
Samples/Assets/StreamingAssets/TestResults.xml.meta
49-
Samples/Assets/StreamingAssets/TestResults.xml
50-
Samples/Assets/StreamingAssets/PerformanceTestResults.json.meta
51-
Samples/Assets/StreamingAssets/PerformanceTestResults.json
52-
Samples/Assets/EntityCache.meta
53-
Samples/Assets/StreamingAssets/EntityCache
54-
Samples/Assets/StreamingAssets/EntityCache.meta
55-
Samples/Assets/EntityCache
44+
**/Assets/StreamingAssets
45+
**/Assets/EntityCache
46+
**/Assets/TypeDependencyCache
47+
**/Assets/SceneDependencyCache
5648
*~master*
5749
*~HEAD*
5850

ECSSamples/Assets/Advanced/Boids/Scripts/BoidObstacleAuthoring.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
using Unity.Entities;
66
using UnityEngine;
77

8-
[RequiresEntityConversion]
98
[AddComponentMenu("DOTS Samples/Boids/BoidObstacle")]
109
[ConverterVersion("joe", 1)]
1110
public class BoidObstacleAuthoring : MonoBehaviour, IConvertGameObjectToEntity

ECSSamples/Assets/Advanced/Boids/Scripts/BoidSchoolAuthoring.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
namespace Samples.Boids
99
{
10-
[RequiresEntityConversion]
1110
[AddComponentMenu("DOTS Samples/Boids/BoidSchool")]
1211
[ConverterVersion("macton", 4)]
1312
public class BoidSchoolAuthoring : MonoBehaviour, IConvertGameObjectToEntity, IDeclareReferencedPrefabs

ECSSamples/Assets/Advanced/Boids/Scripts/BoidTargetAuthoring.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
using Unity.Entities;
66
using UnityEngine;
77

8-
[RequiresEntityConversion]
98
[AddComponentMenu("DOTS Samples/Boids/BoidTarget")]
109
[ConverterVersion("joe", 1)]
1110
public class BoidTargetAuthoring : MonoBehaviour, IConvertGameObjectToEntity

ECSSamples/Assets/Advanced/FixedTimestepSystemUpdate/ProjectileAuthoring.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
namespace Samples.FixedTimestepSystem.Authoring
55
{
6-
[RequiresEntityConversion]
76
[AddComponentMenu("DOTS Samples/FixedTimestepWorkaround/Projectile Spawn Time")]
87
[ConverterVersion("joe", 1)]
98
public class ProjectileAuthoring : MonoBehaviour, IConvertGameObjectToEntity

ECSSamples/Assets/Advanced/GridPath.Tests/CartesianGridOnCubeShortestPathTests.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,30 +26,30 @@ public TestGrid(int rowCount)
2626
int wallFaceStride = rowCount * wallRowStride;
2727
int wallsSize = 6 * wallFaceStride;
2828

29-
Walls = (byte*)UnsafeUtility.Malloc(wallsSize, 16, Allocator.Temp);
29+
Walls = (byte*)Memory.Unmanaged.Allocate(wallsSize, 16, Allocator.Temp);
3030
UnsafeUtility.MemClear(Walls, wallsSize);
3131
for (int i = 0; i < wallsSize; i++)
3232
{
3333
Assert.AreEqual(Walls[i], 0);
3434
}
3535

36-
FaceWorldToLocal = (float4x4*)UnsafeUtility.Malloc(sizeof(float4x4) * 6, 16, Allocator.Temp);
37-
FaceLocalToWorld = (float4x4*)UnsafeUtility.Malloc(sizeof(float4x4) * 6, 16, Allocator.Temp);
38-
FaceLocalToLocal = (float4x4*)UnsafeUtility.Malloc(sizeof(float4x4) * 6 * 6, 16, Allocator.Temp);
36+
FaceWorldToLocal = (float4x4*)Memory.Unmanaged.Allocate(UnsafeUtility.SizeOf<float4x4>() * 6, 16, Allocator.Temp);
37+
FaceLocalToWorld = (float4x4*)Memory.Unmanaged.Allocate(UnsafeUtility.SizeOf<float4x4>() * 6, 16, Allocator.Temp);
38+
FaceLocalToLocal = (float4x4*)Memory.Unmanaged.Allocate(UnsafeUtility.SizeOf<float4x4>() * 6 * 6, 16, Allocator.Temp);
3939

4040
CartesianGridGeneratorUtility.FillCubeFaceTransforms(rowCount, FaceLocalToWorld, FaceWorldToLocal, FaceLocalToLocal);
4141
}
4242

4343
public void Dispose()
4444
{
4545
if (Walls != null)
46-
UnsafeUtility.Free(Walls, Allocator.Temp);
46+
Memory.Unmanaged.Free(Walls, Allocator.Temp);
4747
if (FaceLocalToLocal != null)
48-
UnsafeUtility.Free(FaceLocalToLocal, Allocator.Temp);
48+
Memory.Unmanaged.Free(FaceLocalToLocal, Allocator.Temp);
4949
if (FaceLocalToWorld != null)
50-
UnsafeUtility.Free(FaceLocalToWorld, Allocator.Temp);
50+
Memory.Unmanaged.Free(FaceLocalToWorld, Allocator.Temp);
5151
if (FaceWorldToLocal != null)
52-
UnsafeUtility.Free(FaceWorldToLocal, Allocator.Temp);
52+
Memory.Unmanaged.Free(FaceWorldToLocal, Allocator.Temp);
5353
}
5454

5555
public void SetWallBit(int cellIndex, CartesianGridDirectionBit directionBit)

ECSSamples/Assets/Advanced/GridPath.Tests/CartesianGridOnPlaneShortestPathTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public TestGrid(int rowCount, int colCount)
2525
int wallRowStride = (colCount + 1) / 2;
2626
int wallsSize = rowCount * wallRowStride;
2727

28-
Walls = (byte*)UnsafeUtility.Malloc(wallsSize, 16, Allocator.Temp);
28+
Walls = (byte*)Memory.Unmanaged.Allocate(wallsSize, 16, Allocator.Temp);
2929
UnsafeUtility.MemClear(Walls, wallsSize);
3030

3131
// Add outer boundary walls.
@@ -42,7 +42,7 @@ public TestGrid(int rowCount, int colCount)
4242
public void Dispose()
4343
{
4444
if (Walls != null)
45-
UnsafeUtility.Free(Walls, Allocator.Temp);
45+
Memory.Unmanaged.Free(Walls, Allocator.Temp);
4646
}
4747

4848
public void SetWallBit(int x, int y, CartesianGridDirectionBit directionBit)

ECSSamples/Assets/Advanced/GridPath/Scripts/CartesianGridMovementAuthoring.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
using Unity.Rendering;
33
using UnityEngine;
44

5-
[RequiresEntityConversion]
65
[AddComponentMenu("DOTS Samples/GridPath/Cartesian Grid Movement")]
76
[ConverterVersion("macton", 4)]
87
public class CartesianGridMovementAuthoring : MonoBehaviour, IConvertGameObjectToEntity

ECSSamples/Assets/Advanced/GridPath/Scripts/CartesianGridOnCubeAuthoring.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
using UnityEngine;
55

66
// ReSharper disable once InconsistentNaming
7-
[RequiresEntityConversion]
87
[AddComponentMenu("DOTS Samples/GridPath/Cartesian Grid on Cube")]
98
[ConverterVersion("macton", 20)]
109
public class CartesianGridOnCubeAuthoring : MonoBehaviour, IConvertGameObjectToEntity, IDeclareReferencedPrefabs

ECSSamples/Assets/Advanced/GridPath/Scripts/CartesianGridOnPlaneAuthoring.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
using UnityEngine;
55

66
// ReSharper disable once InconsistentNaming
7-
[RequiresEntityConversion]
87
[AddComponentMenu("DOTS Samples/GridPath/Cartesian Grid on Plane")]
98
[ConverterVersion("macton", 10)]
109
public class CartesianGridOnPlaneAuthoring : MonoBehaviour, IConvertGameObjectToEntity, IDeclareReferencedPrefabs

0 commit comments

Comments
 (0)