add some more test models

Kav

@@ -1 +1 @@
-Subproject commit 565be374bbb539ee652d0fa3b240bafb066bab18
+Subproject commit 2fb20747e4978d1b745cde76a1bcac452dfd34e7

KavTest/KavTestGame.cs

@@ -50,8 +50,14 @@ namespace KavTest
 
             var rustyBallModel = Kav.ModelLoader.Load(
                 GraphicsDevice,
-                Smuggler.Importer.ImportGLB(GraphicsDevice, File.OpenRead("Content/rustysphere.glb"))
+                Smuggler.Importer.ImportGLB(
+                    GraphicsDevice, 
+                    File.OpenRead("Content/rustysphere.glb")
+                )
             );
+            rustyBallModel.DisableNormalMaps();
+            rustyBallModel.DisableAlbedoMaps();
+            rustyBallModel.Albedo = Color.DeepSkyBlue;
 
             var lightBulbModel = Kav.ModelLoader.Load(
                 GraphicsDevice,
@@ -68,6 +74,30 @@ namespace KavTest
                 Smuggler.Importer.ImportGLB(GraphicsDevice, File.OpenRead("Content/avocado.glb"))
             );
 
+            var redCylinderModel = Kav.ModelLoader.Load(
+                GraphicsDevice,
+                Smuggler.Importer.ImportGLB(
+                    GraphicsDevice,
+                    File.OpenRead("Content/redcylinder.glb")
+                )
+            );
+
+            var pinkConeModel = Kav.ModelLoader.Load(
+                GraphicsDevice,
+                Smuggler.Importer.ImportGLB(
+                    GraphicsDevice,
+                    File.OpenRead("Content/pinkcone.glb")
+                )
+            );
+
+            var blueTorusModel = Kav.ModelLoader.Load(
+                GraphicsDevice,
+                Smuggler.Importer.ImportGLB(
+                    GraphicsDevice,
+                    File.OpenRead("Content/bluetorus.glb")
+                )
+            );
+
             WorldBuilder.AddEngine(new InputEngine(this));
             WorldBuilder.AddEngine(new AngularVelocityEngine());
             WorldBuilder.AddEngine(new MoveAlongCurve3DEngine());
@@ -94,21 +124,39 @@ namespace KavTest
             //     new Vector3(-1, 1, 1)
             // ));
 
+            WorldBuilder.SendMessage(new StaticModelSpawnMessage(
+                new Transform3D(new Vector3(0, 1, 0), Quaternion.Identity, new Vector3(1f, 1f, 1f)),
+                rustyBallModel
+            ));
+
             WorldBuilder.SendMessage(new StaticModelSpawnMessage(
                 new Transform3D(new Vector3(0, -3, 0), Quaternion.Identity, new Vector3(10f, 1f, 10f)),
                 floorModel
             ));
 
-            var entity = WorldBuilder.CreateEntity();
+            WorldBuilder.SendMessage(new StaticModelSpawnMessage(
-
-            WorldBuilder.SetComponent(entity, new Transform3DComponent(
                 new Transform3D(
-                    new Vector3(0, 1, 0), 
+                    new Vector3(-3, 1, 0), 
-                    Quaternion.CreateFromAxisAngle(Vector3.Right, -Microsoft.Xna.Framework.MathHelper.PiOver2),
+                    Quaternion.CreateFromAxisAngle(
-                    new Vector3(30, 30, 30))
+                        Vector3.Right, 
-                )
+                        -Microsoft.Xna.Framework.MathHelper.PiOver2
-            );
+                    ),                    
-            WorldBuilder.SetComponent(entity, new ModelComponent(avocadoModel));
+                    new Vector3(1f, 1f, 1f)
+                ),
+                blueTorusModel
+            ));
+
+            WorldBuilder.SendMessage(new StaticModelSpawnMessage(
+                new Transform3D(
+                    new Vector3(3, 1, 0), 
+                    Quaternion.CreateFromAxisAngle(
+                        Vector3.Right, 
+                        -Microsoft.Xna.Framework.MathHelper.PiOver2
+                    ),                    
+                    new Vector3(1f, 1f, 1f)
+                ),
+                pinkConeModel
+            ));
             
             for (var i = 0; i < 1; i++)
             {
@@ -125,11 +173,11 @@ namespace KavTest
             var ambientLightEntity = WorldBuilder.CreateEntity();
 
             WorldBuilder.SetComponent(ambientLightEntity, new AmbientLightComponent(
-                new Color(0.3f, 0.3f, 0.3f)
+                new Color(0.4f, 0.4f, 0.4f)
             ));
 
             WorldBuilder.SendMessage(new DirectionalLightSpawnMessage(
-                Quaternion.CreateFromAxisAngle(Vector3.Right, Microsoft.Xna.Framework.MathHelper.PiOver4),
+                Quaternion.CreateFromAxisAngle(Vector3.Right, Microsoft.Xna.Framework.MathHelper.Pi / 3f),
                 Color.LightGoldenrodYellow,
                 0.7f
             ));

KavTest/Renderers/SceneRenderer.cs

@@ -19,6 +19,7 @@ namespace KavTest.Renderers
             {
                 foreach (var entity in ReadEntitiesAsEnumerable<ModelComponent>())
                 {
+                    /* FIXME: this transformation should definitely not go here */
                     var transformComponent = GetComponent<Transform3DComponent>(entity);
                     var modelComponent = GetComponent<ModelComponent>(entity);
                     if (HasComponent<OverrideAlbedoComponent>(entity))
@@ -29,11 +30,8 @@ namespace KavTest.Renderers
                         {
                             foreach (var meshPart in mesh.MeshParts)
                             {
-                                if (meshPart.Effect is DeferredPBR_GBufferEffect gBufferEffect)
+                                meshPart.DisableAlbedoMap = true;
-                                {
+                                meshPart.Albedo = overrideAlbedoComponent.Color;
-                                    gBufferEffect.AlbedoTexture = null;
-                                    gBufferEffect.Albedo = overrideAlbedoComponent.Color;
-                                }
                             }
                         }
                     }
@@ -136,6 +134,7 @@ namespace KavTest.Renderers
                 // Renderer.DeferredRender(
                 //     camera,
                 //     ModelTransforms,
+                //     AmbientLight,
                 //     PointLights,
                 //     DirectionalLight()
                 // );