Added a decal component.

Decal component isn't fully implemented. Needs to handle resource loading. Added checks if context id is valid before handling them in various graphics contexts. This removes lookups, and reduces risk if we don't have to do validity checks first outside of the context.
gscept · Nov 17, 2024 · 1183971 · 1183971
1 parent d75bc81
commit 1183971
Show file tree

Hide file tree

Showing 18 changed files with 273 additions and 104 deletions.
diff --git a/code/addons/graphicsfeature/CMakeLists.txt b/code/addons/graphicsfeature/CMakeLists.txt
@@ -16,7 +16,10 @@ fips_dir(managers)
 	)
 fips_dir(components)
 	nebula_idl_compile(
-		graphicsfeature.json
+		camera.json
+		decal.json
+		lighting.json
+		model.json
 	)
 nebula_end_module()
 
diff --git a/code/addons/graphicsfeature/components/camera.json b/code/addons/graphicsfeature/components/camera.json
@@ -0,0 +1,45 @@
+{
+  "namespace": "GraphicsFeature",
+  "enums": {
+    "ProjectionMode": {
+      "Perspective": 0,
+      "Orthographic": 1
+    }
+  },
+  "components": {
+    "Camera": {
+      "viewHandle": {
+        "type": "uint",
+        "default": -1,
+        "hideInInspector": true
+      },
+      "localTransform": {
+        "type": "mat4",
+        "hideInInspector": true
+      },
+      "fieldOfView": {
+        "type": "float",
+        "default": 70.0
+      },
+      "aspectRatio": {
+        "type": "float"
+      },
+      "zNear": {
+        "type": "float",
+        "default": 0.01
+      },
+      "zFar": {
+        "type": "float",
+        "default": 1000.0
+      },
+      "orthographicWidth": {
+        "type": "float",
+        "default": 1.0
+      },
+      "projectionMode": {
+        "type": "GraphicsFeature::ProjectionMode",
+        "default": 0
+      }
+    }
+  }
+}
diff --git a/code/addons/graphicsfeature/components/decal.json b/code/addons/graphicsfeature/components/decal.json
@@ -0,0 +1,16 @@
+{
+  "namespace": "GraphicsFeature",
+  "components": {
+    "Decal": {
+      "graphicsEntityId": {
+        "type": "uint",
+        "default": -1,
+        "hideInInspector": true
+      },
+      "texture": {
+        "type": "resource",
+        "description": "The texture that should be projected"
+      }
+    }
+  }
+}
diff --git a/...csfeature/components/graphicsfeature.json → .../graphicsfeature/components/lighting.json b/...csfeature/components/graphicsfeature.json → .../graphicsfeature/components/lighting.json
@@ -1,10 +1,6 @@
 {
   "namespace": "GraphicsFeature",
   "enums": {
-    "ProjectionMode": {
-      "Perspective": 0,
-      "Orthographic": 1
-    },
     "AreaLightShape": {
       "Disk": 0,
       "Rectangle": 1,
@@ -85,60 +81,6 @@
       "twoSided": "bool",
       "castShadows": "bool",
       "renderMesh": "bool"
-    },
-    "Model": {
-      "resource": {
-        "type": "resource",
-        "default": "mdl:system/placeholder.n3"
-      },
-      "graphicsEntityId": {
-        "type": "uint",
-        "default": -1,
-        "hideInInspector": true
-      },
-      "raytracing": "bool",
-      "anim": {
-        "type": "resource",
-        "default": ""
-      },
-      "skeleton": {
-        "type": "resource",
-        "default": ""
-      }
-    },
-    "Camera": {
-      "viewHandle": {
-        "type": "uint",
-        "default": -1,
-        "hideInInspector": true
-      },
-      "localTransform": {
-        "type": "mat4",
-        "hideInInspector": true
-      },
-      "fieldOfView": {
-        "type": "float",
-        "default": 70.0
-      },
-      "aspectRatio": {
-        "type": "float"
-      },
-      "zNear": {
-        "type": "float",
-        "default": 0.01
-      },
-      "zFar": {
-        "type": "float",
-        "default": 1000.0
-      },
-      "orthographicWidth": {
-        "type": "float",
-        "default": 1.0
-      },
-      "projectionMode": {
-        "type": "GraphicsFeature::ProjectionMode",
-        "default": 0
-      }
     }
   }
 }
diff --git a/code/addons/graphicsfeature/components/model.json b/code/addons/graphicsfeature/components/model.json
@@ -0,0 +1,25 @@
+{
+  "namespace": "GraphicsFeature",
+  "components": {
+    "Model": {
+      "resource": {
+        "type": "resource",
+        "default": "mdl:system/placeholder.n3"
+      },
+      "graphicsEntityId": {
+        "type": "uint",
+        "default": -1,
+        "hideInInspector": true
+      },
+      "raytracing": "bool",
+      "anim": {
+        "type": "resource",
+        "default": ""
+      },
+      "skeleton": {
+        "type": "resource",
+        "default": ""
+      }
+    }
+  }
+}
diff --git a/code/addons/graphicsfeature/graphicsfeatureunit.cc b/code/addons/graphicsfeature/graphicsfeatureunit.cc
@@ -37,7 +37,10 @@
 #include "flat/graphicsfeature/terrainschema.h"
 #include "flat/graphicsfeature/vegetationschema.h"
 #include "nflatbuffer/flatbufferinterface.h"
-#include "components/graphicsfeature.h"
+#include "components/camera.h"
+#include "components/decal.h"
+#include "components/lighting.h"
+#include "components/model.h"
 
 #include "scripting/deargui.h"
 
@@ -87,6 +90,7 @@ GraphicsFeatureUnit::OnAttach()
     this->RegisterComponentType<SpotLight>({.decay = true, .OnInit = &GraphicsManager::InitSpotLight });
     this->RegisterComponentType<AreaLight>({.decay = true, .OnInit = &GraphicsManager::InitAreaLight });
     this->RegisterComponentType<Model>({.decay = true, .OnInit = &GraphicsManager::InitModel });
+    this->RegisterComponentType<Decal>({.decay = true, .OnInit = &GraphicsManager::InitDecal});
     this->RegisterComponentType<Camera>();
     Scripting::RegisterDearguiModule();
 }

diff --git a/code/addons/graphicsfeature/managers/cameramanager.h b/code/addons/graphicsfeature/managers/cameramanager.h
@@ -15,7 +15,7 @@
 #include "ids/idgenerationpool.h"
 #include "graphics/graphicsentity.h"
 #include "math/vec3.h"
-#include "graphicsfeature/components/graphicsfeature.h"
+#include "graphicsfeature/components/camera.h"
 
 namespace Graphics
 {

diff --git a/code/addons/graphicsfeature/managers/graphicsmanager.cc b/code/addons/graphicsfeature/managers/graphicsmanager.cc
@@ -11,7 +11,6 @@
 #include "raytracing/raytracingcontext.h"
 #include "characters/charactercontext.h"
 #include "game/gameserver.h"
-#include "graphicsfeature/components/graphicsfeature.h"
 #include "basegamefeature/components/basegamefeature.h"
 #include "basegamefeature/components/position.h"
 #include "basegamefeature/components/orientation.h"
@@ -20,6 +19,7 @@
 #include "io/jsonwriter.h"
 #include "lighting/lightcontext.h"
 #include "game/componentinspection.h"
+#include "decals/decalcontext.h"
 
 namespace GraphicsFeature
 {
@@ -130,6 +130,22 @@ DeregisterLight(Graphics::GraphicsEntityId gfxId)
     Graphics::DestroyEntity(gfxId);
 }
 
+//------------------------------------------------------------------------------
+/**
+*/
+void
+DeregisterDecal(Graphics::GraphicsEntityId gfxId)
+{
+    if (gfxId == Graphics::InvalidGraphicsEntityId)
+        return;
+
+    if (Decals::DecalContext::IsEntityRegistered(gfxId))
+    {
+        Decals::DecalContext::DeregisterEntity(gfxId);
+    }
+    Graphics::DestroyEntity(gfxId);
+}
+
 //------------------------------------------------------------------------------
 /**
 */
@@ -169,6 +185,14 @@ GraphicsManager::OnDecay()
         AreaLight* light = areaLightData + i;
         DeregisterLight(light->graphicsEntityId);
     }
+
+    Game::ComponentDecayBuffer const decalDecayBuffer = world->GetDecayBuffer(Game::GetComponentId<Decal>());
+    Decal* decalData = (Decal*)decalDecayBuffer.buffer;
+    for (int i = 0; i < decalDecayBuffer.size; i++)
+    {
+        Decal* decal = decalData + i;
+        DeregisterDecal(decal->graphicsEntityId);
+    }
 }
 
 //------------------------------------------------------------------------------
@@ -188,11 +212,8 @@ GraphicsManager::InitUpdateModelTransformProcessor()
                Game::Scale const& scale,
                GraphicsFeature::Model const& model)
             {
-                if (model.graphicsEntityId != -1)
-                {
-                    Math::mat4 worldTransform = Math::trs(pos, orient, scale);
-                    Models::ModelContext::SetTransform(model.graphicsEntityId, worldTransform);
-                }
+                Math::mat4 worldTransform = Math::trs(pos, orient, scale);
+                Models::ModelContext::SetTransform(model.graphicsEntityId, worldTransform);
             }
         )
         .Build();
@@ -212,8 +233,7 @@ GraphicsManager::InitUpdateLightTransformProcessor()
         .Func(
             [](Game::World* world, Game::Position const& pos, GraphicsFeature::PointLight const& light)
             {
-                if (Lighting::LightContext::IsEntityRegistered(light.graphicsEntityId))
-                    Lighting::LightContext::SetPosition(light.graphicsEntityId, pos);
+                Lighting::LightContext::SetPosition(light.graphicsEntityId, pos);
             }
         )
         .Build();
@@ -227,11 +247,8 @@ GraphicsManager::InitUpdateLightTransformProcessor()
                Game::Orientation const& rot,
                GraphicsFeature::SpotLight const& light)
             {
-                if (Lighting::LightContext::IsEntityRegistered(light.graphicsEntityId))
-                {
-                    Lighting::LightContext::SetPosition(light.graphicsEntityId, pos);
-                    Lighting::LightContext::SetRotation(light.graphicsEntityId, rot);
-                }
+                Lighting::LightContext::SetPosition(light.graphicsEntityId, pos);
+                Lighting::LightContext::SetRotation(light.graphicsEntityId, rot);
             }
         )
         .Build();
@@ -246,12 +263,34 @@ GraphicsManager::InitUpdateLightTransformProcessor()
                Game::Scale const& scale,
                GraphicsFeature::AreaLight const& light)
             {
-                if (Lighting::LightContext::IsEntityRegistered(light.graphicsEntityId))
-                {
-                    Lighting::LightContext::SetPosition(light.graphicsEntityId, pos);
-                    Lighting::LightContext::SetRotation(light.graphicsEntityId, rot);
-                    Lighting::LightContext::SetScale(light.graphicsEntityId, scale);
-                }
+                Lighting::LightContext::SetPosition(light.graphicsEntityId, pos);
+                Lighting::LightContext::SetRotation(light.graphicsEntityId, rot);
+                Lighting::LightContext::SetScale(light.graphicsEntityId, scale);
+            }
+        )
+        .Build();
+}
+
+//------------------------------------------------------------------------------
+/**
+*/
+void
+GraphicsManager::InitUpdateDecalTransformProcessor()
+{
+    Game::World* world = Game::GetWorld(WORLD_DEFAULT);
+
+    Game::ProcessorBuilder(world, "GraphicsManager.UpdateDecalTransform"_atm)
+        .On("OnEndFrame")
+        .Excluding<Game::Static>()
+        .Func(
+            [](Game::World* world,
+               Game::Position const& pos,
+               Game::Orientation const& rot,
+               Game::Scale const& scale,
+               GraphicsFeature::Decal const& decal)
+            {
+                Math::mat4 transform = Math::trs(pos, rot, scale);
+                Decals::DecalContext::SetTransform(decal.graphicsEntityId, transform);
             }
         )
         .Build();
@@ -266,6 +305,7 @@ GraphicsManager::OnActivate()
     Manager::OnActivate();
     this->InitUpdateModelTransformProcessor();
     this->InitUpdateLightTransformProcessor();
+    this->InitUpdateDecalTransformProcessor();
 }
 
 //------------------------------------------------------------------------------
@@ -350,6 +390,27 @@ GraphicsManager::InitAreaLight(Game::World* world, Game::Entity entity, AreaLigh
     Lighting::LightContext::SetScale(light->graphicsEntityId, scale);
 }
 
+//------------------------------------------------------------------------------
+/**
+*/
+void
+GraphicsManager::InitDecal(Game::World* world, Game::Entity entity, Decal* decal)
+{
+    //decal->graphicsEntityId = Graphics::CreateEntity().id;
+    //Game::Position pos = world->GetComponent<Game::Position>(entity);
+    //Game::Orientation rot = world->GetComponent<Game::Orientation>(entity);
+    //Game::Scale scale = world->GetComponent<Game::Scale>(entity);
+    //Decals::DecalContext::RegisterEntity(decal->graphicsEntityId);
+    //Decals::DecalContext::SetupDecalPBR(
+    //    decal->graphicsEntityId,
+    //    transform,
+    //    decal->resource, // TODO: load resource
+    //    
+    //);
+    //Math::mat4 transform = Math::trs(pos, rot, scale);
+    //Decals::DecalContext::SetTransform(decal->graphicsEntityId, transform);
+}
+
 //------------------------------------------------------------------------------
 /**
 */
@@ -440,6 +501,23 @@ GraphicsManager::OnCleanup(Game::World* world)
             }
         }
 
+        Game::DestroyFilter(filter);
+    }
+    { // Decal cleanup
+        Game::Filter filter = Game::FilterBuilder().Including<Decal>().Build();
+        Game::Dataset data = world->Query(filter);
+
+        for (int v = 0; v < data.numViews; v++)
+        {
+            Game::Dataset::View const& view = data.views[v];
+            Decal const* const componentData = (Decal*)view.buffers[0];
+
+            for (IndexT i = 0; i < view.numInstances; ++i)
+            {
+                DeregisterDecal((componentData + i)->graphicsEntityId);
+            }
+        }
+
         Game::DestroyFilter(filter);
     }
 }