Add base level and fix include of old terrain settings.

Fix DDGI compile issue
gscept · Jan 20, 2025 · 30e427a · 30e427a
1 parent 716a2d9
commit 30e427a
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 6 deletions.
diff --git a/code/addons/graphicsfeature/graphicsfeatureunit.cc b/code/addons/graphicsfeature/graphicsfeatureunit.cc
@@ -34,7 +34,7 @@
 
 #include "nflatbuffer/nebula_flat.h"
 #include "nflatbuffer/flatbufferinterface.h"
-#include "flat/application/levelsettings.h"
+#include "flat/options/levelsettings.h"
 #include "components/camera.h"
 #include "components/decal.h"
 #include "components/lighting.h"

diff --git a/code/render/gi/ddgicontext.cc b/code/render/gi/ddgicontext.cc
@@ -451,7 +451,7 @@ DDGIContext::SetupVolume(const Graphics::GraphicsEntityId id, const VolumeSetup&
     volume.numProbesX = setup.numProbesX;
     volume.numProbesY = setup.numProbesY;
     volume.numProbesZ = setup.numProbesZ;
-    volume.numRaysPerProbe = Math::min(setup.numRaysPerProbe, Raytracetest::DDGI_NUM_FIXED_RAYS);
+    volume.numRaysPerProbe = Math::min(setup.numRaysPerProbe, ProbeUpdate::DDGI_NUM_FIXED_RAYS);
     volume.options = setup.options;
 
     //volume.options.flags.lowPrecisionTextures = true;

diff --git a/tests/testtbui/main.cc b/tests/testtbui/main.cc
@@ -19,7 +19,7 @@
 
 #include "nflatbuffer/nebula_flat.h"
 #include "nflatbuffer/flatbufferinterface.h"
-#include "flat/graphicsfeature/terrainschema.h"
+#include "flat/options/levelsettings.h"
 
 ImplementNebulaApplication();
 
@@ -47,9 +47,8 @@ class NebulaDemoApplication : public App::GameApplication
         this->gameServer->AttachGameFeature(this->editorFeatureUnit);
 #endif
 
-        Flat::FlatbufferInterface::LoadSchema("data:flatbuffer/graphicsfeature/terrainschema.bfbs"_uri);
-        IO::URI tablePath = "proj:work/data/tables/terrain.json"_uri;
-        CompileFlatbuffer(GraphicsFeature::TerrainSetup, tablePath, "data:tables/graphicsfeature");
+        IO::URI tablePath = "proj:work/data/tables/base_level.json"_uri;
+        CompileFlatbuffer(App::LevelSettings, tablePath, "tbl:app");
     }
     /// cleanup game features
     void CleanupGameFeatures()

diff --git a/tests/work/data/tables/base_level.json b/tests/work/data/tables/base_level.json
@@ -0,0 +1,19 @@
+{
+    "terrain_setup": {
+        "config": {
+            "use": false
+        }
+    },
+    "vegetation_setup": {
+
+    },
+    "sun_settings": {
+
+    },
+    "cluster_settings": {
+
+    },
+    "histogram_settings": {
+
+    }
+}