From 04767061737967da141d93c781882146b282cd47 Mon Sep 17 00:00:00 2001
From: Bert Temme <btemme@hotmail.com>
Date: Tue, 15 Oct 2024 14:54:12 +0200
Subject: [PATCH 1/8] release 2.9.0

---
 README.md              | 2 ++
 src/i3dm.export.csproj | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index d766599..4b6623f 100644
--- a/README.md
+++ b/README.md
@@ -306,6 +306,8 @@ Press F5 to start debugging.
 
 ## History
 
+2024-10-15: release 2.9.0: add tileset version option
+
 2024-08-01: release 2.8.3: fix release
 
 2024-08-01: release 2.8.2: fix for I3dm using rtc_center for high precision positions
diff --git a/src/i3dm.export.csproj b/src/i3dm.export.csproj
index e28cb72..52967f9 100644
--- a/src/i3dm.export.csproj
+++ b/src/i3dm.export.csproj
@@ -5,9 +5,9 @@
     <TargetFramework>net8.0</TargetFramework>
 	<ToolCommandName>i3dm.export</ToolCommandName>
 	<PackageOutputPath>./nupkg</PackageOutputPath>
-	<Version>2.8.3</Version>
-	<AssemblyVersion>2.8.3</AssemblyVersion>
-	<FileVersion>2.8.3</FileVersion>
+	<Version>2.9.0</Version>
+	<AssemblyVersion>2.9.0</AssemblyVersion>
+	<FileVersion>2.9.0</FileVersion>
 	<PackageProjectUrl>https://github.com/geodan/i3dm.export</PackageProjectUrl>
 	<RepositoryUrl>https://github.com/geodan/i3dm.export</RepositoryUrl>
 	<RepositoryType>git</RepositoryType>

From 45961d7d30be7244f9eeb74d670ab43eaa282a17 Mon Sep 17 00:00:00 2001
From: Bert Temme <btemme@hotmail.com>
Date: Wed, 16 Oct 2024 16:26:13 +0200
Subject: [PATCH 2/8] Handle gpu instancing tags is all null for a tile

---
 src/GPUTileHandler.cs     | 25 +++++++++++++++----------
 tests/TileHandlerTests.cs | 31 +++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 10 deletions(-)

diff --git a/src/GPUTileHandler.cs b/src/GPUTileHandler.cs
index b232c14..d0979ba 100644
--- a/src/GPUTileHandler.cs
+++ b/src/GPUTileHandler.cs
@@ -25,19 +25,24 @@ public static byte[] GetGPUTile(List<Instance> instances, bool UseScaleNonUnifor
         settings.GpuMeshInstancingMinCount = 0;
         var model = sceneBuilder.ToGltf2(settings);
 
-        var schema = AddMetadataSchema(model);
+        if (instances.Any(s => s.Tags != null))
+        {
 
-        var distinctModels = instances.Select(s => s.Model).Distinct();
+            var schema = AddMetadataSchema(model);
 
-        var i = 0;
+            var distinctModels = instances.Select(s => s.Model).Distinct();
 
-        foreach (var distinctModel in distinctModels)
-        {
-            var modelInstances = instances.Where(s => s.Model.Equals(distinctModel)).ToList();
-            var featureIdBuilder = GetFeatureIdBuilder(schema, modelInstances);
-            var node = model.LogicalNodes[i]; 
-            node.AddInstanceFeatureIds(featureIdBuilder);
-            i++;
+
+            var i = 0;
+
+            foreach (var distinctModel in distinctModels)
+            {
+                var modelInstances = instances.Where(s => s.Model.Equals(distinctModel)).ToList();
+                var featureIdBuilder = GetFeatureIdBuilder(schema, modelInstances);
+                var node = model.LogicalNodes[i];
+                node.AddInstanceFeatureIds(featureIdBuilder);
+                i++;
+            }
         }
 
         foreach (var node in model.LogicalNodes)
diff --git a/tests/TileHandlerTests.cs b/tests/TileHandlerTests.cs
index 80dbcc1..51ff14f 100644
--- a/tests/TileHandlerTests.cs
+++ b/tests/TileHandlerTests.cs
@@ -13,6 +13,35 @@ namespace i3dm.export.tests;
 
 public class TileHandlerTests
 {
+    [Test]
+    public void GetGpuTileWithoutTagsTest()
+    {
+        Tiles3DExtensions.RegisterExtensions();
+
+        // arrange
+        var instances = new List<Instance>();
+        var instance = new Instance();
+        instance.Position = new Wkx.Point(1, 2, 0);
+        instance.Scale = 1;
+        instance.Model = "Box.glb";
+        instances.Add(instance);
+
+        // act
+        var tile = GPUTileHandler.GetGPUTile(instances, UseScaleNonUniform: false);
+
+        var fileName = Path.Combine(TestContext.CurrentContext.WorkDirectory, "instancing_tile_without_tags.glb");
+        File.WriteAllBytes(fileName, tile);
+
+        var model = ModelRoot.Load(fileName);
+
+        // assert
+        // Model only contains the EXT_mesh_gpu_instancing extension, no other extensions
+        Assert.That(model.ExtensionsUsed.Count() == 1);
+        Assert.That(model.ExtensionsUsed.First() == "EXT_mesh_gpu_instancing");
+
+        Assert.That(tile.Length > 0);
+    }
+
     [Test]
     public void GetGpuTileTest()
     {
@@ -34,6 +63,8 @@ public void GetGpuTileTest()
         File.WriteAllBytes(fileName, tile);
 
         var model = ModelRoot.Load(fileName);
+        Assert.That(model.ExtensionsUsed.Count() == 3);
+
         var extInstanceFeaturesExtension = model.LogicalNodes[0].GetExtension<MeshExtInstanceFeatures>();
 
         var extStructuralMetadataExtension = model.GetExtension<EXTStructuralMetadataRoot>();

From a96c6215a57a902c377b137183ce1a4fc2a50fde Mon Sep 17 00:00:00 2001
From: Bert Temme <btemme@hotmail.com>
Date: Thu, 17 Oct 2024 09:21:20 +0200
Subject: [PATCH 3/8] Update README.md

---
 README.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4b6623f..8f74358 100644
--- a/README.md
+++ b/README.md
@@ -148,11 +148,14 @@ Only the i3m files should be copied to a production server.
 When parameter 'use_external_model' is set to true, only the model name will be stored in the i3dm payload. 
 In the i3dm header the value 'gltfFormat' is set to 0. In this case, the model should be a valid absolute or relative url to 
 the binary glTF. The client is responsible for retrieving the binary glTF's. Both the i3dm's and binary glTF's should be copied to a production server.
+Option 'use_external_model' is only available when '--use_gpu_instancing' is false. 
 
 ## Composites
 
 Starting release 2.0, for every tile there will be a composiste tile (cmpt) - even if there is only 1 model available in the tile.  
-Specs see https://docs.opengeospatial.org/cs/18-053r2/18-053r2.html#249 . The composite tile contains a collection of instanced 3d tiles (i3dm), for each model there is 1 i3dm.
+Specs see https://docs.opengeospatial.org/cs/18-053r2/18-053r2.html#249 . 
+The composite tile contains a collection of instanced 3d tiles (i3dm), for each model there is 1 i3dm.
+When option --use_i3dm  is set to true, only I3dm's are created. When there are multiple models in a tile only the first one is used.
 
 ## Implicit tiling
 

From 9cbb7dfc0e630909ad9be51a3f278474a30bd0e6 Mon Sep 17 00:00:00 2001
From: Bert Temme <btemme@hotmail.com>
Date: Thu, 17 Oct 2024 13:49:46 +0200
Subject: [PATCH 4/8] add testfixtures

---
 tests/TileHandlerTests.cs        |  15 ++++++++-------
 tests/i3dm.export.tests.csproj   |   7 +++++--
 tests/{ => testfixtures}/Box.glb | Bin
 tests/testfixtures/tree.glb      | Bin 0 -> 24796 bytes
 4 files changed, 13 insertions(+), 9 deletions(-)
 rename tests/{ => testfixtures}/Box.glb (100%)
 create mode 100644 tests/testfixtures/tree.glb

diff --git a/tests/TileHandlerTests.cs b/tests/TileHandlerTests.cs
index 51ff14f..dd2c2ca 100644
--- a/tests/TileHandlerTests.cs
+++ b/tests/TileHandlerTests.cs
@@ -23,7 +23,7 @@ public void GetGpuTileWithoutTagsTest()
         var instance = new Instance();
         instance.Position = new Wkx.Point(1, 2, 0);
         instance.Scale = 1;
-        instance.Model = "Box.glb";
+        instance.Model = "./testfixtures/Box.glb";
         instances.Add(instance);
 
         // act
@@ -52,7 +52,7 @@ public void GetGpuTileTest()
         var instance = new Instance();
         instance.Position = new Wkx.Point(1, 2, 0);
         instance.Scale = 1;
-        instance.Model = "Box.glb";
+        instance.Model = "./testfixtures/Box.glb";
         instance.Tags = JArray.Parse("[{'id':123},{'name': 'test'}]");
         instances.Add(instance);
 
@@ -87,7 +87,7 @@ public void GetTileTest()
         var instance = new Instance();
         instance.Position = new Wkx.Point(1, 2);
         instance.Scale = 1;
-        instance.Model = "Box.glb";
+        instance.Model = "./testfixtures/Box.glb";
         instances.Add(instance);
 
         // act
@@ -106,6 +106,7 @@ public void GetTileTest()
     [Test]
     public void GetCompositeTileTest()
     {
+
         // arrange
         var instances = new List<Instance>();
         var instance = new Instance();
@@ -153,7 +154,7 @@ public void GetTileWithScaleNonUniformTest()
         var instance = new Instance();
         instance.Position = new Wkx.Point(1, 2);
         instance.ScaleNonUniform = scaleNonuniform;
-        instance.Model = "Box.glb";
+        instance.Model = "./testfixtures/Box.glb";
         instances.Add(instance);
 
         // act
@@ -197,12 +198,12 @@ public void GetTileWithRtcCenterTest()
         var instances = new List<Instance>();
         var instance = new Instance();
         instance.Position = new Wkx.Point(1, 2);
-        instance.Model = "Box.glb";
+        instance.Model = "./testfixtures/Box.glb";
         instances.Add(instance);
 
         var instance1 = new Instance();
         instance1.Position = new Wkx.Point(10, 20);
-        instance1.Model = "Box.glb";
+        instance1.Model = "./testfixtures/Box.glb";
         instances.Add(instance1);
 
         // act
@@ -224,7 +225,7 @@ public void GetTileWithTagsTest()
         var instances = new List<Instance>();
         var instance = new Instance();
         instance.Position = new Wkx.Point(1, 2);
-        instance.Model = "Box.glb";
+        instance.Model = "./testfixtures/Box.glb";
         var tags = JArray.Parse("[{'id':123},{'name': 'test'}]");
         instance.Tags = tags;
         instances.Add(instance);
diff --git a/tests/i3dm.export.tests.csproj b/tests/i3dm.export.tests.csproj
index c3ebb34..db631cb 100644
--- a/tests/i3dm.export.tests.csproj
+++ b/tests/i3dm.export.tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
@@ -17,7 +17,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Update="Box.glb">
+    <None Update="testfixtures\Box.glb">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="testfixtures\tree.glb">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
diff --git a/tests/Box.glb b/tests/testfixtures/Box.glb
similarity index 100%
rename from tests/Box.glb
rename to tests/testfixtures/Box.glb
diff --git a/tests/testfixtures/tree.glb b/tests/testfixtures/tree.glb
new file mode 100644
index 0000000000000000000000000000000000000000..70c751ac49982cd4307ab08fbaf2e8f17e453c12
GIT binary patch
literal 24796
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

literal 0
HcmV?d00001


From 646e882ea0c36271facaaa56823208c53841a236 Mon Sep 17 00:00:00 2001
From: Bert Temme <btemme@hotmail.com>
Date: Thu, 17 Oct 2024 14:06:24 +0200
Subject: [PATCH 5/8] Update README.md

---
 README.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8f74358..dba2f80 100644
--- a/README.md
+++ b/README.md
@@ -286,7 +286,11 @@ Warning: When the input glTF model has transformations, the model will be transf
 cases it's better to remove the transformations from the input model. For example tool 'gltf-tansform' - function clearNodeTransform (https://gltf-transform.dev/modules/functions/functions/clearNodeTransform) can be 
 used to clear local transformations.
 
-- Known issue: Getting attributes in Cesium does not work when there are multiple input models
+Known issues GPU Instancing:
+
+- #81: Trees rotation/ z placement wrong 
+
+- Getting attributes in Cesium does not work when there are multiple input models
 https://community.cesium.com/t/upgrade-3d-tileset-with-composite-cmpt-tile-to-1-1-attribute-data-missing/33177/2
 
 ## Developing

From 636cad8a74814dcd4ff4b414134f127de69f4cfb Mon Sep 17 00:00:00 2001
From: Bert Temme <btemme@hotmail.com>
Date: Thu, 17 Oct 2024 14:07:34 +0200
Subject: [PATCH 6/8] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index dba2f80..6e44bb4 100644
--- a/README.md
+++ b/README.md
@@ -288,7 +288,7 @@ used to clear local transformations.
 
 Known issues GPU Instancing:
 
-- #81: Trees rotation/ z placement wrong 
+- https://github.com/Geodan/i3dm.export/issues/81: Trees rotation/ z placement wrong 
 
 - Getting attributes in Cesium does not work when there are multiple input models
 https://community.cesium.com/t/upgrade-3d-tileset-with-composite-cmpt-tile-to-1-1-attribute-data-missing/33177/2

From 20a0fb33d2d17132d803f653fc39bc7c43bdd4ca Mon Sep 17 00:00:00 2001
From: Bert Temme <btemme@hotmail.com>
Date: Tue, 22 Oct 2024 14:42:27 +0200
Subject: [PATCH 7/8] update verticals

---
 src/GPUTileHandler.cs | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/GPUTileHandler.cs b/src/GPUTileHandler.cs
index d0979ba..faf07cb 100644
--- a/src/GPUTileHandler.cs
+++ b/src/GPUTileHandler.cs
@@ -47,7 +47,8 @@ public static byte[] GetGPUTile(List<Instance> instances, bool UseScaleNonUnifor
 
         foreach (var node in model.LogicalNodes)
         {
-            node.LocalTransform *= Matrix4x4.CreateTranslation(translation);
+            var tra = new Vector3((float)translation.X, (float)translation.Y, (float)translation.Z);
+            node.LocalTransform *= Matrix4x4.CreateTranslation(tra);
         }
 
         var bytes = model.WriteGLB().Array;
@@ -73,7 +74,7 @@ private static StructuralMetadataClass AddMetadataSchema(ModelRoot gltf)
         return schemaClass;
     }
 
-    private static SceneBuilder AddModels(IEnumerable<Instance> instances, Vector3 translation, bool UseScaleNonUniform)
+    private static SceneBuilder AddModels(IEnumerable<Instance> instances, Point translation, bool UseScaleNonUniform)
     {
         var sceneBuilder = new SceneBuilder();
 
@@ -88,7 +89,7 @@ private static SceneBuilder AddModels(IEnumerable<Instance> instances, Vector3 t
         return sceneBuilder;
     }
 
-    private static void AddModelInstancesToScene(SceneBuilder sceneBuilder, IEnumerable<Instance> instances, bool UseScaleNonUniform, Vector3 translation, string model)
+    private static void AddModelInstancesToScene(SceneBuilder sceneBuilder, IEnumerable<Instance> instances, bool UseScaleNonUniform, Point translation, string model)
     {
         var modelInstances = instances.Where(s => s.Model.Equals(model)).ToList();
         var modelRoot = ModelRoot.Load(model);
@@ -103,7 +104,7 @@ private static void AddModelInstancesToScene(SceneBuilder sceneBuilder, IEnumera
         }
     }
 
-    private static SceneBuilder GetSceneBuilder(IMeshBuilder<MaterialBuilder> meshBuilder, Instance instance, bool UseScaleNonUniform, Vector3 translation, int pointId)
+    private static SceneBuilder GetSceneBuilder(IMeshBuilder<MaterialBuilder> meshBuilder, Instance instance, bool UseScaleNonUniform, Point translation, int pointId)
     {
         var transformation = GetInstanceTransform(instance, UseScaleNonUniform, translation);
         var json = "{\"_FEATURE_ID_0\":" + pointId + "}";
@@ -112,7 +113,7 @@ private static SceneBuilder GetSceneBuilder(IMeshBuilder<MaterialBuilder> meshBu
         return sceneBuilder;
     }
 
-    private static AffineTransform GetInstanceTransform(Instance instance, bool UseScaleNonUniform, Vector3 translation)
+    private static AffineTransform GetInstanceTransform(Instance instance, bool UseScaleNonUniform, Point translation)
     {
         var point = (Point)instance.Position;
 
@@ -126,7 +127,7 @@ private static AffineTransform GetInstanceTransform(Instance instance, bool UseS
         var instanceQuaternion = Quaternion.CreateFromYawPitchRoll((float)instance.Yaw, (float)instance.Pitch, (float)instance.Roll);
         var res = Quaternion.CreateFromRotationMatrix(m4);
 
-        var position2 = position - translation;
+        var position2 = new Vector3((float)(position.X - translation.X), (float)(position.Y - translation.Y), (float)(position.Z - translation.Z));
 
         var scale = UseScaleNonUniform ?
             new Vector3((float)instance.ScaleNonUniform[0], (float)instance.ScaleNonUniform[1], (float)instance.ScaleNonUniform[2]) :
@@ -199,8 +200,8 @@ private static Matrix4x4 GetTransformationMatrix((Vector3 East, Vector3 North, V
         m4.M33 = forward.Z;
         return m4;
     }
-    private static Vector3 ToYUp(Point position)
+    private static Point ToYUp(Point position)
     {
-        return new Vector3((float)position.X, (float)position.Z, (float)position.Y * -1);
+        return new Point((double)position.X, (double)position.Z, (double)position.Y * -1);
     }
 }

From f32bf5709d032209bcf56dd620b42b65b99163bb Mon Sep 17 00:00:00 2001
From: Bert Temme <btemme@hotmail.com>
Date: Wed, 23 Oct 2024 11:12:20 +0200
Subject: [PATCH 8/8] set default scale to 1

---
 src/Instance.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Instance.cs b/src/Instance.cs
index ec232f8..53c43eb 100644
--- a/src/Instance.cs
+++ b/src/Instance.cs
@@ -5,6 +5,10 @@ namespace i3dm.export;
 
 public class Instance
 {
+    public Instance()
+    {
+        Scale = 1;
+    }
     public Geometry Position { get; set; }
 
     public double Scale { get; set; }