[email protected]

## [1.3.8] - 2024-11-08 ### Removed * removing various material assets within entities (Test.mat and TestMaterial.mat). ### Fixed * Disable "new empty subscene" menu item on default untitled scene. * Fix invalid queries generated for `IJobEntity` with `[WithPresent(typeof(T))]` and `EnabledRef<T>` and/or `in T` in the same job.
needle-mirror · Nov 8, 2024 · 39f2f3b · 39f2f3b
1 parent 18e63ee
commit 39f2f3b
Show file tree

Hide file tree

Showing 46 changed files with 339 additions and 348 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,18 @@ uid: changelog
 
 # Changelog
 
+## [1.3.8] - 2024-11-08
+
+### Removed
+
+* removing various material assets within entities (Test.mat and TestMaterial.mat).
+
+### Fixed
+
+* Disable "new empty subscene" menu item on default untitled scene.
+* Fix invalid queries generated for `IJobEntity` with `[WithPresent(typeof(T))]` and `EnabledRef<T>` and/or `in T` in the same job.
+
+
 ## [1.3.5] - 2024-10-04
 
 ### Changed
@@ -19,6 +31,7 @@ uid: changelog
 * Exception thrown under certain circumstances when a system was destroyed could break various DOTS editor windows.
 
 
+
 ## [1.3.2] - 2024-09-06
 
 ### Added

diff --git a/Unity.Entities.TestComponents/DependencyTestAuthoring.cs b/Unity.Entities.TestComponents/DependencyTestAuthoring.cs
@@ -1,4 +1,5 @@
 using System;
+using UnityEditor;
 using UnityEngine;
 
 namespace Unity.Entities.Tests
@@ -19,9 +20,27 @@ public override void Bake(DependencyTestAuthoring authoring)
                 DependsOn(authoring.GameObject);
                 // This test shouldn't require transform components
                 var entity = GetEntity(TransformUsageFlags.None);
+                Color color = default;
+                if (authoring.Material)
+                {
+                    DependsOn(authoring.Material);
+                    color = authoring.Material.color;
+                }
+                else
+                {
+#if UNITY_EDITOR
+                    var material = AssetDatabase.LoadAssetAtPath<Material>("Assets/TestMaterial.asset");
+                    if (material != null)
+                    {
+                        DependsOn(material);
+                        color = material.color;
+                    }
+#endif
+                }
+
                 AddComponent(entity, new ConversionDependencyData
                 {
-                    MaterialColor = DependsOn(authoring.Material) != null ? authoring.Material.color : default,
+                    MaterialColor = color,
                     HasMaterial = DependsOn(authoring.Material) != null,
                     TextureFilterMode = DependsOn(authoring.Texture) != null ? authoring.Texture.filterMode : default,
                     HasTexture = DependsOn(authoring.Texture) != null

diff --git a/Unity.Entities.Tests/ForEachCodegen/JobEntityISystemTests.cs b/Unity.Entities.Tests/ForEachCodegen/JobEntityISystemTests.cs
@@ -33,6 +33,7 @@ public void SetUp()
             TestEntity = m_Manager.CreateEntity(myArch);
             m_Manager.SetComponentData(TestEntity, new EcsTestData { value = 3 });
             m_Manager.SetComponentData(TestEntity, new EcsTestData2 { value0 = 4 });
+            m_Manager.SetComponentData(TestEntity, new EcsTestDataEnableable { value = 17 });
             var buffer = m_Manager.GetBuffer<EcsIntElement>(TestEntity);
             buffer.Add(new EcsIntElement { Value = 18 });
             buffer.Add(new EcsIntElement { Value = 19 });
@@ -97,14 +98,29 @@ ref SystemState GetSystemStateRef()
         public void WithDisabled() => GetTestSystemUnsafe().WithDisabled(ref GetSystemStateRef());
 
         [Test]
-        public void EnableDisabled() => GetTestSystemUnsafe().EnableDisabled(ref GetSystemStateRef());
+        public void WithDisabled_RefRW() => GetTestSystemUnsafe().WithDisabled_RefRW(ref GetSystemStateRef());
+
+        [Test]
+        public void WithDisabled_EnabledRefRW() => GetTestSystemUnsafe().WithDisabled_EnabledRefRW(ref GetSystemStateRef());
+
+        [Test]
+        public void WithDisabled_RefRW_EnabledRefRW() => GetTestSystemUnsafe().WithDisabled_RefRW_EnabledRefRW(ref GetSystemStateRef());
 
         [Test]
         public void WithAbsent() => GetTestSystemUnsafe().WithAbsent(ref GetSystemStateRef());
 
         [Test]
         public void WithPresent() => GetTestSystemUnsafe().WithPresent(ref GetSystemStateRef());
 
+        [Test]
+        public void WithPresent_RefRW() => GetTestSystemUnsafe().WithPresent_RefRW(ref GetSystemStateRef());
+
+        [Test]
+        public void WithPresent_EnabledRefRW() => GetTestSystemUnsafe().WithPresent_EnabledRefRW(ref GetSystemStateRef());
+
+        [Test]
+        public void WithPresent_RefRW_EnabledRefRW() => GetTestSystemUnsafe().WithPresent_RefRW_EnabledRefRW(ref GetSystemStateRef());
+
         [Test]
         public void WithAny_DoesntExecute_OnEntityWithoutThatComponent() => GetTestSystemUnsafe().WithAny_DoesntExecute_OnEntityWithoutThatComponent(ref GetSystemStateRef());
 
@@ -239,11 +255,31 @@ partial struct WithDisabledJob : IJobEntity
     }
 
     [WithDisabled(typeof(EcsTestDataEnableable))]
-    partial struct EnableDisabledJob : IJobEntity
+    partial struct WithDisabled_RefRW_Job : IJobEntity
+    {
+        public int disabledValue;
+
+        void Execute(ref EcsTestData e1, RefRW<EcsTestDataEnableable> ref2) => e1.value = disabledValue + ref2.ValueRO.value;
+    }
+
+    [WithDisabled(typeof(EcsTestDataEnableable))]
+    partial struct WithDisabled_EnabledRefRW_Job : IJobEntity
     {
         void Execute(EnabledRefRW<EcsTestDataEnableable> e1) => e1.ValueRW = true;
     }
 
+    [WithDisabled(typeof(EcsTestDataEnableable))]
+    partial struct WithDisabled_RefRW_EnabledRefRW_Job : IJobEntity
+    {
+        public int disabledValue;
+
+        void Execute(ref EcsTestData e1, EnabledRefRW<EcsTestDataEnableable> e2, RefRW<EcsTestDataEnableable> ref2)
+        {
+            e1.value = disabledValue + ref2.ValueRO.value;
+            e2.ValueRW = true;
+        }
+    }
+
     [WithAbsent(typeof(EcsTestData3))]
     partial struct WithAbsentJob : IJobEntity
     {
@@ -260,6 +296,38 @@ partial struct WithPresentJob : IJobEntity
         void Execute(ref EcsTestData e1) => e1.value = presentValue;
     }
 
+    [WithPresent(typeof(EcsTestDataEnableable))]
+    partial struct WithPresent_RefRW_Job : IJobEntity
+    {
+        public int presentValue;
+
+        void Execute(ref EcsTestData e1, RefRW<EcsTestDataEnableable> ref2) => e1.value = presentValue + ref2.ValueRO.value;
+    }
+
+    [WithPresent(typeof(EcsTestDataEnableable))]
+    partial struct WithPresent_EnabledRefRW_Job : IJobEntity
+    {
+        public int presentValue;
+
+        void Execute(ref EcsTestData e1, EnabledRefRW<EcsTestDataEnableable> eref2)
+        {
+            e1.value = presentValue;
+            eref2.ValueRW = !eref2.ValueRO;
+        }
+    }
+
+    [WithPresent(typeof(EcsTestDataEnableable))]
+    partial struct WithPresent_RefRW_EnabledRefRW_Job : IJobEntity
+    {
+        public int presentValue;
+
+        void Execute(ref EcsTestData e1, RefRW<EcsTestDataEnableable> ref2, EnabledRefRW<EcsTestDataEnableable> eref2)
+        {
+            e1.value = presentValue + ref2.ValueRO.value;
+            eref2.ValueRW = !eref2.ValueRO;
+        }
+    }
+
     [WithAny(typeof(EcsTestData3))]
     partial struct WithAny_DoesntExecute_OnEntityWithoutThatComponentJob : IJobEntity
     {
@@ -395,14 +463,32 @@ public void WithDisabled(ref SystemState state)
             Assert.AreEqual(1, state.EntityManager.GetComponentData<EcsTestData>(JobEntityISystemTests.TestEntity).value);
         }
 
-        public void EnableDisabled(ref SystemState state)
+        public void WithDisabled_RefRW(ref SystemState state)
+        {
+            new WithDisabled_RefRW_Job{ disabledValue = 1 }.Schedule();
+            state.Dependency.Complete();
+            Assert.AreEqual(1+17, state.EntityManager.GetComponentData<EcsTestData>(JobEntityISystemTests.TestEntity).value);
+        }
+
+        public void WithDisabled_EnabledRefRW(ref SystemState state)
+        {
+            Assert.AreEqual(1, SystemAPI.QueryBuilder().WithDisabled<EcsTestDataEnableable>().Build().CalculateEntityCount());
+            Assert.AreEqual(0, SystemAPI.QueryBuilder().WithAll<EcsTestDataEnableable>().Build().CalculateEntityCount());
+            new WithDisabled_EnabledRefRW_Job{}.Schedule();
+            state.Dependency.Complete();
+            Assert.AreEqual(0, SystemAPI.QueryBuilder().WithDisabled<EcsTestDataEnableable>().Build().CalculateEntityCount());
+            Assert.AreEqual(1, SystemAPI.QueryBuilder().WithAll<EcsTestDataEnableable>().Build().CalculateEntityCount());
+        }
+
+        public void WithDisabled_RefRW_EnabledRefRW(ref SystemState state)
         {
             Assert.AreEqual(1, SystemAPI.QueryBuilder().WithDisabled<EcsTestDataEnableable>().Build().CalculateEntityCount());
             Assert.AreEqual(0, SystemAPI.QueryBuilder().WithAll<EcsTestDataEnableable>().Build().CalculateEntityCount());
-            new EnableDisabledJob{}.Schedule();
+            new WithDisabled_RefRW_EnabledRefRW_Job{ disabledValue = 1 }.Schedule();
             state.Dependency.Complete();
             Assert.AreEqual(0, SystemAPI.QueryBuilder().WithDisabled<EcsTestDataEnableable>().Build().CalculateEntityCount());
             Assert.AreEqual(1, SystemAPI.QueryBuilder().WithAll<EcsTestDataEnableable>().Build().CalculateEntityCount());
+            Assert.AreEqual(1+17, state.EntityManager.GetComponentData<EcsTestData>(JobEntityISystemTests.TestEntity).value);
         }
 
         public void WithAbsent(ref SystemState state)
@@ -426,6 +512,50 @@ public void WithPresent(ref SystemState state)
             Assert.AreEqual(2, state.EntityManager.GetComponentData<EcsTestData>(JobEntityISystemTests.TestEntity).value);
         }
 
+        public void WithPresent_RefRW(ref SystemState state)
+        {
+            // Test with the present component disabled
+            state.EntityManager.SetComponentEnabled<EcsTestDataEnableable>(JobEntityISystemTests.TestEntity, false);
+            new WithPresent_RefRW_Job{ presentValue= 1}.Schedule();
+            state.Dependency.Complete();
+            Assert.AreEqual(1+17, state.EntityManager.GetComponentData<EcsTestData>(JobEntityISystemTests.TestEntity).value);
+            // test again with the present component enabled
+            state.EntityManager.SetComponentEnabled<EcsTestDataEnableable>(JobEntityISystemTests.TestEntity, true);
+            new WithPresent_RefRW_Job{ presentValue= 2}.Schedule();
+            state.Dependency.Complete();
+            Assert.AreEqual(2+17, state.EntityManager.GetComponentData<EcsTestData>(JobEntityISystemTests.TestEntity).value);
+        }
+
+        public void WithPresent_EnabledRefRW(ref SystemState state)
+        {
+            // Test with the present component disabled
+            state.EntityManager.SetComponentEnabled<EcsTestDataEnableable>(JobEntityISystemTests.TestEntity, false);
+            new WithPresent_EnabledRefRW_Job{ presentValue= 1}.Schedule();
+            state.Dependency.Complete();
+            Assert.AreEqual(1, state.EntityManager.GetComponentData<EcsTestData>(JobEntityISystemTests.TestEntity).value);
+            Assert.IsTrue(state.EntityManager.IsComponentEnabled<EcsTestDataEnableable>(JobEntityISystemTests.TestEntity));
+            // test again with the present component enabled
+            new WithPresent_EnabledRefRW_Job{ presentValue= 2}.Schedule();
+            state.Dependency.Complete();
+            Assert.AreEqual(2, state.EntityManager.GetComponentData<EcsTestData>(JobEntityISystemTests.TestEntity).value);
+            Assert.IsFalse(state.EntityManager.IsComponentEnabled<EcsTestDataEnableable>(JobEntityISystemTests.TestEntity));
+        }
+
+        public void WithPresent_RefRW_EnabledRefRW(ref SystemState state)
+        {
+            // Test with the present component disabled
+            state.EntityManager.SetComponentEnabled<EcsTestDataEnableable>(JobEntityISystemTests.TestEntity, false);
+            new WithPresent_RefRW_EnabledRefRW_Job{ presentValue= 1}.Schedule();
+            state.Dependency.Complete();
+            Assert.AreEqual(1+17, state.EntityManager.GetComponentData<EcsTestData>(JobEntityISystemTests.TestEntity).value);
+            Assert.IsTrue(state.EntityManager.IsComponentEnabled<EcsTestDataEnableable>(JobEntityISystemTests.TestEntity));
+            // test again with the present component enabled
+            new WithPresent_RefRW_EnabledRefRW_Job{ presentValue= 2}.Schedule();
+            state.Dependency.Complete();
+            Assert.AreEqual(2+17, state.EntityManager.GetComponentData<EcsTestData>(JobEntityISystemTests.TestEntity).value);
+            Assert.IsFalse(state.EntityManager.IsComponentEnabled<EcsTestDataEnableable>(JobEntityISystemTests.TestEntity));
+        }
+
         public void WithAny_DoesntExecute_OnEntityWithoutThatComponent(ref SystemState state)
         {
             new WithAny_DoesntExecute_OnEntityWithoutThatComponentJob { one = 1 }.Schedule();

diff --git a/Unity.Entities/SourceGenerators/AspectGenerator.dll b/Unity.Entities/SourceGenerators/AspectGenerator.dll
diff --git a/Unity.Entities/SourceGenerators/AspectGenerator.pdb b/Unity.Entities/SourceGenerators/AspectGenerator.pdb
diff --git a/Unity.Entities/SourceGenerators/Common.dll b/Unity.Entities/SourceGenerators/Common.dll
diff --git a/Unity.Entities/SourceGenerators/Common.pdb b/Unity.Entities/SourceGenerators/Common.pdb
diff --git a/Unity.Entities/SourceGenerators/JobEntityGenerator.dll b/Unity.Entities/SourceGenerators/JobEntityGenerator.dll
diff --git a/Unity.Entities/SourceGenerators/JobEntityGenerator.pdb b/Unity.Entities/SourceGenerators/JobEntityGenerator.pdb
diff --git a/Unity.Entities/SourceGenerators/Source~/JobEntityGenerator/JobEntityDescription.cs b/Unity.Entities/SourceGenerators/Source~/JobEntityGenerator/JobEntityDescription.cs
@@ -591,7 +591,7 @@ public void FillFromAttributes(SyntaxList<AttributeListSyntax> attributeLists, S
                         case SimpleNameSyntax { Identifier.ValueText: "WithPresent" }:
                             if (attribute.ArgumentList != null)
                                 foreach (var argument in attribute.ArgumentList.Arguments)
-                                    AddQueryInstanceFromAttribute(QueryPresentTypes, argument, QueryType.Present, semanticModel, removeFromQueryAllIfFound: false);
+                                    AddQueryInstanceFromAttribute(QueryPresentTypes, argument, QueryType.Present, semanticModel, removeFromQueryAllIfFound: true);
                             break;
                         case SimpleNameSyntax { Identifier.ValueText: "WithAbsent" }:
                             if (attribute.ArgumentList != null)

diff --git a/Unity.Entities/SourceGenerators/Source~/Mock/Unity.Entities.Mock/EntitiesMock.cs b/Unity.Entities/SourceGenerators/Source~/Mock/Unity.Entities.Mock/EntitiesMock.cs
@@ -35,6 +35,8 @@ public void Reset()
         public EntityQueryBuilder WithDisabled<T>() => this;
         public EntityQueryBuilder WithDisabledRW<T>() => this;
         public EntityQueryBuilder WithAbsent<T>() => this;
+        public EntityQueryBuilder WithPresent<T>() => this;
+        public EntityQueryBuilder WithPresentRW<T>() => this;
         public EntityQueryBuilder WithAspect<T>() => this;
         public EntityQueryBuilder WithOptions(EntityQueryOptions options) => this;
         public EntityQueryBuilder AddAdditionalQuery() => this;
@@ -81,6 +83,14 @@ public sealed class WithDisabledAttribute : Attribute
     {
         public WithDisabledAttribute(params Type[] types){}
     }
+    public sealed class WithAbsentAttribute : Attribute
+    {
+        public WithAbsentAttribute(params Type[] types){}
+    }
+    public sealed class WithPresentAttribute : Attribute
+    {
+        public WithPresentAttribute(params Type[] types){}
+    }
     public sealed class WithChangeFilterAttribute : Attribute
     {
         public WithChangeFilterAttribute(params Type[] types){}
@@ -476,6 +486,7 @@ public struct SystemAPIQueryBuilder
         public SystemAPIQueryBuilder WithNone<T1>() => default;
         public SystemAPIQueryBuilder WithDisabled<T1>() => default;
         public SystemAPIQueryBuilder WithAbsent<T1>() => default;
+        public SystemAPIQueryBuilder WithPresent<T1>() => default;
         public SystemAPIQueryBuilder WithOptions(EntityQueryOptions options) => default;
         public EntityQuery Build() => default;
     }

diff --git a/Unity.Entities/SourceGenerators/SystemGenerator.Common.dll b/Unity.Entities/SourceGenerators/SystemGenerator.Common.dll
diff --git a/Unity.Entities/SourceGenerators/SystemGenerator.Common.pdb b/Unity.Entities/SourceGenerators/SystemGenerator.Common.pdb
diff --git a/Unity.Entities/SourceGenerators/SystemGenerator.EntityQueryBulkOperations.dll b/Unity.Entities/SourceGenerators/SystemGenerator.EntityQueryBulkOperations.dll
diff --git a/Unity.Entities/SourceGenerators/SystemGenerator.EntityQueryBulkOperations.pdb b/Unity.Entities/SourceGenerators/SystemGenerator.EntityQueryBulkOperations.pdb
diff --git a/Unity.Entities/SourceGenerators/SystemGenerator.LambdaJobs.dll b/Unity.Entities/SourceGenerators/SystemGenerator.LambdaJobs.dll
diff --git a/Unity.Entities/SourceGenerators/SystemGenerator.LambdaJobs.pdb b/Unity.Entities/SourceGenerators/SystemGenerator.LambdaJobs.pdb
diff --git a/Unity.Entities/SourceGenerators/SystemGenerator.SystemAPI.Query.dll b/Unity.Entities/SourceGenerators/SystemGenerator.SystemAPI.Query.dll
diff --git a/Unity.Entities/SourceGenerators/SystemGenerator.SystemAPI.Query.pdb b/Unity.Entities/SourceGenerators/SystemGenerator.SystemAPI.Query.pdb
diff --git a/Unity.Entities/SourceGenerators/SystemGenerator.SystemAPI.QueryBuilder.dll b/Unity.Entities/SourceGenerators/SystemGenerator.SystemAPI.QueryBuilder.dll
diff --git a/Unity.Entities/SourceGenerators/SystemGenerator.SystemAPI.QueryBuilder.pdb b/Unity.Entities/SourceGenerators/SystemGenerator.SystemAPI.QueryBuilder.pdb
diff --git a/Unity.Entities/SourceGenerators/SystemGenerator.SystemAPI.dll b/Unity.Entities/SourceGenerators/SystemGenerator.SystemAPI.dll
diff --git a/Unity.Entities/SourceGenerators/SystemGenerator.SystemAPI.pdb b/Unity.Entities/SourceGenerators/SystemGenerator.SystemAPI.pdb
diff --git a/Unity.Entities/SourceGenerators/SystemGenerator.dll b/Unity.Entities/SourceGenerators/SystemGenerator.dll
diff --git a/Unity.Entities/SourceGenerators/SystemGenerator.pdb b/Unity.Entities/SourceGenerators/SystemGenerator.pdb
diff --git a/Unity.Entities/SourceGenerators/Unity.Entities.Analyzer.CodeFixes.dll b/Unity.Entities/SourceGenerators/Unity.Entities.Analyzer.CodeFixes.dll
diff --git a/Unity.Entities/SourceGenerators/Unity.Entities.Analyzer.CodeFixes.pdb b/Unity.Entities/SourceGenerators/Unity.Entities.Analyzer.CodeFixes.pdb
diff --git a/Unity.Entities/SourceGenerators/Unity.Entities.Analyzer.dll b/Unity.Entities/SourceGenerators/Unity.Entities.Analyzer.dll
diff --git a/Unity.Entities/SourceGenerators/Unity.Entities.Analyzer.pdb b/Unity.Entities/SourceGenerators/Unity.Entities.Analyzer.pdb
diff --git a/Unity.Scenes.Editor.Tests/Assets/SceneWithMaterialDependency/SubScene.unity b/Unity.Scenes.Editor.Tests/Assets/SceneWithMaterialDependency/SubScene.unity
@@ -38,12 +38,11 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 11
+  serializedVersion: 12
   m_GIWorkflowMode: 1
   m_GISettings:
     serializedVersion: 2
@@ -98,13 +97,14 @@ LightmapSettings:
     m_TrainingDataDestination: TrainingData
     m_LightProbeSampleCountMultiplier: 4
   m_LightingDataAsset: {fileID: 0}
-  m_UseShadowmask: 1
+  m_LightingSettings: {fileID: 4890085278179872738, guid: 00a1e3be8d77248bfb0ebd4477a42b82,
+    type: 2}
 --- !u!196 &4
 NavMeshSettings:
   serializedVersion: 2
   m_ObjectHideFlags: 0
   m_BuildSettings:
-    serializedVersion: 2
+    serializedVersion: 3
     agentTypeID: 0
     agentRadius: 0.5
     agentHeight: 2
@@ -117,7 +117,9 @@ NavMeshSettings:
     cellSize: 0.16666667
     manualTileSize: 0
     tileSize: 256
-    accuratePlacement: 0
+    buildHeightMesh: 0
+    maxJobWorkers: 0
+    preserveTilesOutsideBounds: 0
     debug:
       m_Flags: 0
   m_NavMeshData: {fileID: 0}
@@ -152,19 +154,25 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   GameObject: {fileID: 0}
   Asset: {fileID: 0}
-  Material: {fileID: 2100000, guid: f40229054a993f149aea8b2f9012f687, type: 2}
-  Texture: {fileID: 0}
+  Material: {fileID: 0}
+  Texture: {fileID: 2800000, guid: d52bd2787bc5f5d408f93a562e50feed, type: 2}
 --- !u!4 &572202328
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 572202326}
+  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_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1660057539 &9223372036854775807
+SceneRoots:
+  m_ObjectHideFlags: 0
+  m_Roots:
+  - {fileID: 572202328}