Fixed more templates.

genaray · genaray · commit 1e077325d09f · 2025-03-06T15:45:17.000+01:00
diff --git a/src/Arch/Arch.csproj b/src/Arch/Arch.csproj
@@ -485,11 +485,6 @@ Merged arrays in EntityInfo for increased performance when creating and destroyi
       <DesignTime>True</DesignTime>
       <DependentUpon>Archetype.SetRange.tt</DependentUpon>
     </Compile>
-    <Compile Update="Templates\World.EntityQuery.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>World.EntityQuery.tt</DependentUpon>
-    </Compile>
     <Compile Update="Templates\World.ParallelQuery.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
@@ -600,6 +595,11 @@ Merged arrays in EntityInfo for increased performance when creating and destroyi
       <DesignTime>True</DesignTime>
       <DependentUpon>World.Query.tt</DependentUpon>
     </Compile>
+    <Compile Update="Templates\World.EntityQuery.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>World.EntityQuery.tt</DependentUpon>
+    </Compile>
   </ItemGroup>
 
 </Project>
diff --git a/src/Arch/Templates/World.EntityQuery.tt b/src/Arch/Templates/World.EntityQuery.tt
@@ -12,7 +12,7 @@ namespace Arch.Core;
 public partial class World
 {
 <#
-    for (var index = 2; index <= Amount; index++)
+    for (var index = 1; index <= Amount; index++)
     {
         var generics = AppendGenerics(index);
         var getFirstElement = AppendGetFirstComponentFrom(index);
diff --git a/src/Arch/Templates/World.InlineEntityQuery.tt b/src/Arch/Templates/World.InlineEntityQuery.tt
@@ -3,11 +3,13 @@
 <#@ import namespace="System.Collections.Generic" #>
 <#@ include file="Helpers.ttinclude" #>
 
+// TODO: Move query with T0 into world.cs?
+
 namespace Arch.Core;
 public partial class World
 {
 <#
-    for (var index = 2; index <= Amount; index++)
+    for (var index = 1; index <= Amount; index++)
     {
         var generics = AppendGenerics(index);
         var getFirstElement = AppendGetFirstComponentFrom(index);
diff --git a/src/Arch/Templates/World.InlineEntityQueryWithRef.tt b/src/Arch/Templates/World.InlineEntityQueryWithRef.tt
@@ -3,11 +3,13 @@
 <#@ import namespace="System.Collections.Generic" #>
 <#@ include file="Helpers.ttinclude" #>
 
+// TODO: Move query with T0 into world.cs?
+
 namespace Arch.Core;
 public partial class World
 {
 <#
-    for (var index = 2; index <= Amount; index++)
+    for (var index = 1; index <= Amount; index++)
     {
         var generics = AppendGenerics(index);
         var getFirstElement = AppendGetFirstComponentFrom(index);
diff --git a/src/Arch/Templates/World.InlineParallelEntityQuery.tt b/src/Arch/Templates/World.InlineParallelEntityQuery.tt
@@ -3,11 +3,13 @@
 <#@ import namespace="System.Collections.Generic" #>
 <#@ include file="Helpers.ttinclude" #>
 
+// TODO: Move query with T0 into world.cs?
+
 namespace Arch.Core;
 public partial class World
 {
 <#
-    for (var index = 2; index <= Amount; index++)
+    for (var index = 1; index <= Amount; index++)
     {
         var generics = AppendGenerics(index);
 #>
diff --git a/src/Arch/Templates/World.InlineParallelQuery.tt b/src/Arch/Templates/World.InlineParallelQuery.tt
@@ -3,11 +3,13 @@
 <#@ import namespace="System.Collections.Generic" #>
 <#@ include file="Helpers.ttinclude" #>
 
+// TODO: Move query with T0 into world.cs?
+
 namespace Arch.Core;
 public partial class World
 {
 <#
-    for (var index = 2; index < Amount; index++)
+    for (var index = 1; index < Amount; index++)
     {
         var generics = AppendGenerics(index);
 #>
diff --git a/src/Arch/Templates/World.InlineQuery.tt b/src/Arch/Templates/World.InlineQuery.tt
@@ -3,11 +3,13 @@
 <#@ import namespace="System.Collections.Generic" #>
 <#@ include file="Helpers.ttinclude" #>
 
+// TODO: Move query with T0 into world.cs?
+
 namespace Arch.Core;
 public partial class World
 {
 <#
-    for (var index = 2; index <= Amount; index++)
+    for (var index = 1; index <= Amount; index++)
     {
         var generics = AppendGenerics(index);
         var getFirstElement = AppendGetFirstComponentFrom(index);
diff --git a/src/Arch/Templates/World.InlineQueryWithRef.tt b/src/Arch/Templates/World.InlineQueryWithRef.tt
@@ -3,11 +3,13 @@
 <#@ import namespace="System.Collections.Generic" #>
 <#@ include file="Helpers.ttinclude" #>
 
+// TODO: Move query with T0 into world.cs?
+
 namespace Arch.Core;
 public partial class World
 {
 <#
-    for (var index = 2; index <= Amount; index++)
+    for (var index = 1; index <= Amount; index++)
     {
         var generics = AppendGenerics(index);
         var getFirstElement = AppendGetFirstComponentFrom(index);
diff --git a/src/Arch/Templates/World.ParallelQuery.tt b/src/Arch/Templates/World.ParallelQuery.tt
@@ -3,11 +3,13 @@
 <#@ import namespace="System.Collections.Generic" #>
 <#@ include file="Helpers.ttinclude" #>
 
+// TODO: Move query with T0 into world.cs?
+
 namespace Arch.Core;
 public partial class World
 {
 <#
-    for (var index = 2; index <= Amount; index++)
+    for (var index = 1; index <= Amount; index++)
     {
         var generics = AppendGenerics(index);
 #>
diff --git a/src/Arch/Templates/World.ParallelQueryWithEntity.tt b/src/Arch/Templates/World.ParallelQueryWithEntity.tt
@@ -3,11 +3,13 @@
 <#@ import namespace="System.Collections.Generic" #>
 <#@ include file="Helpers.ttinclude" #>
 
+// TODO: Move query with T0 into world.cs?
+
 namespace Arch.Core;
 public partial class World
 {
 <#
-    for (var index = 2; index <= Amount; index++)
+    for (var index = 1; index <= Amount; index++)
     {
         var generics = AppendGenerics(index);
 #>

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ namespace Arch.Core;`
`12`	`12`	`public partial class World`
`13`	`13`	`{`
`14`	`14`	`<#`
`15`		`- for (var index = 2; index <= Amount; index++)`
	`15`	`+ for (var index = 1; index <= Amount; index++)`
`16`	`16`	`{`
`17`	`17`	`var generics = AppendGenerics(index);`
`18`	`18`	`var getFirstElement = AppendGetFirstComponentFrom(index);`
Original file line number	Diff line number	Diff line change
`@@ -3,11 +3,13 @@`
`3`	`3`	`<#@ import namespace="System.Collections.Generic" #>`
`4`	`4`	`<#@ include file="Helpers.ttinclude" #>`
`5`	`5`
	`6`	`+// TODO: Move query with T0 into world.cs?`
	`7`	`+`
`6`	`8`	`namespace Arch.Core;`
`7`	`9`	`public partial class World`
`8`	`10`	`{`
`9`	`11`	`<#`
`10`		`- for (var index = 2; index <= Amount; index++)`
	`12`	`+ for (var index = 1; index <= Amount; index++)`
`11`	`13`	`{`
`12`	`14`	`var generics = AppendGenerics(index);`
`13`	`15`	`var getFirstElement = AppendGetFirstComponentFrom(index);`