Added an AreaLight component to the GraphicsFeature

Author: fLindahl

code/addons/graphicsfeature/components/graphicsfeature.json

@@ -3,7 +3,12 @@
   "enums": {
     "ProjectionMode": {
       "Perspective": 0,
-      "Orthographic": 1,
+      "Orthographic": 1
+    },
+    "AreaLightShape": {
+      "Disk": 0,
+      "Rectangle": 1,
+      "Tube": 2
     }
   },
   "components": {
@@ -13,7 +18,7 @@
         "default": -1
       },
       "color": {
-        "type": "colour",
+        "type": "color",
         "default": [ 1.0, 1.0, 1.0, 1.0 ]
       },
       "intensity": {
@@ -32,7 +37,7 @@
         "default": -1
       },
       "color": {
-        "type": "colour",
+        "type": "color",
         "default": [ 1.0, 1.0, 1.0, 1.0 ]
       },
       "intensity": {
@@ -53,6 +58,30 @@
       },
       "castShadows": "bool"
     },
+    "AreaLight": {
+      "graphicsEntityId": {
+        "type": "uint",
+        "default": -1
+      },
+      "shape": {
+        "type": "GraphicsFeature::AreaLightShape",
+        "default": 0
+      },
+      "color": {
+        "type": "color",
+        "default": [ 1.0, 1.0, 1.0, 1.0 ]
+      },
+      "intensity": {
+        "type": "float",
+        "default": 50.0 // candela
+      },
+      "range": {
+        "type": "float",
+        "default": 8.0
+      },
+      "twoSided": "bool",
+      "castShadows": "bool"
+    },
     "Model": {
       "resource": {
         "type": "resource",

code/addons/graphicsfeature/graphicsfeatureunit.cc

@@ -85,6 +85,7 @@ GraphicsFeatureUnit::OnAttach()
 {
     this->RegisterComponentType<PointLight>({.decay = true, .OnInit = &GraphicsManager::InitPointLight });
     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<Camera>();
     Scripting::RegisterDearguiModule();

code/addons/graphicsfeature/managers/graphicsmanager.cc

@@ -161,6 +161,14 @@ GraphicsManager::OnDecay()
         SpotLight* light = spotLightData + i;
         DeregisterLight(light->graphicsEntityId);
     }
+
+    Game::ComponentDecayBuffer const areaLightDecayBuffer = world->GetDecayBuffer(Game::GetComponentId<AreaLight>());
+    AreaLight* areaLightData = (AreaLight*)areaLightDecayBuffer.buffer;
+    for (int i = 0; i < areaLightDecayBuffer.size; i++)
+    {
+        AreaLight* light = areaLightData + i;
+        DeregisterLight(light->graphicsEntityId);
+    }
 }
 
 //------------------------------------------------------------------------------
@@ -242,6 +250,33 @@ GraphicsManager::InitSpotLight(Game::World* world, Game::Entity entity, SpotLigh
     Lighting::LightContext::SetRotation(light->graphicsEntityId, rot);
 }
 
+//------------------------------------------------------------------------------
+/**
+*/
+void
+GraphicsManager::InitAreaLight(Game::World* world, Game::Entity entity, AreaLight* light)
+{
+    light->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);
+
+    Lighting::LightContext::RegisterEntity(light->graphicsEntityId);
+    Lighting::LightContext::SetupAreaLight(
+        light->graphicsEntityId,
+        (Lighting::LightContext::AreaLightShape)light->shape,
+        light->color.vec,
+        light->intensity,
+        light->range,
+        light->twoSided,
+        light->castShadows
+    );
+    Lighting::LightContext::SetPosition(light->graphicsEntityId, pos);
+    Lighting::LightContext::SetRotation(light->graphicsEntityId, rot);
+    Lighting::LightContext::SetScale(light->graphicsEntityId, scale);
+}
+
 //------------------------------------------------------------------------------
 /**
 */
@@ -313,6 +348,23 @@ GraphicsManager::OnCleanup(Game::World* world)
             }
         }
 
+        Game::DestroyFilter(filter);
+    }
+    { // AreaLight cleanup
+        Game::Filter filter = Game::FilterBuilder().Including<AreaLight>().Build();
+        Game::Dataset data = world->Query(filter);
+
+        for (int v = 0; v < data.numViews; v++)
+        {
+            Game::Dataset::View const& view = data.views[v];
+            AreaLight const* const componentData = (AreaLight*)view.buffers[0];
+
+            for (IndexT i = 0; i < view.numInstances; ++i)
+            {
+                DeregisterLight((componentData + i)->graphicsEntityId);
+            }
+        }
+
         Game::DestroyFilter(filter);
     }
 }

code/addons/graphicsfeature/managers/graphicsmanager.h

@@ -39,6 +39,8 @@ class GraphicsManager : public Game::Manager
     static void InitPointLight(Game::World* world, Game::Entity entity, PointLight* light);
     /// called automatically when a spot light needs to be initialized
     static void InitSpotLight(Game::World* world, Game::Entity entity, SpotLight* light);
+    /// called automatically when an area light needs to be initialized
+    static void InitAreaLight(Game::World* world, Game::Entity entity, AreaLight* light);
 
 private:
     void InitUpdateModelTransformProcessor();

fips-files/generators/NIDL.py

@@ -1,4 +1,4 @@
-Version = 144
+Version = 145
 
 import sys
 if __name__ == '__main__':