Extend boids examples to include env props within visualisation

Also unified model naming of examples (in particular Circles Spatial3D was listed as bruteforce).
FLAMEGPU · Oct 13, 2022 · 8694ba5 · 8694ba5
1 parent d55c269
commit 8694ba5
Show file tree

Hide file tree

Showing 10 changed files with 89 additions and 14 deletions.
diff --git a/examples/boids_bruteforce/src/main.cu b/examples/boids_bruteforce/src/main.cu
@@ -307,7 +307,7 @@ FLAMEGPU_AGENT_FUNCTION(inputdata, flamegpu::MessageBruteForce, flamegpu::Messag
 }
 
 int main(int argc, const char ** argv) {
-    flamegpu::ModelDescription model("Boids_BruteForce");
+    flamegpu::ModelDescription model("Boids BruteForce");
 
     {   // Location message
         flamegpu::MessageBruteForce::Description &message = model.newMessage("location");
@@ -398,8 +398,20 @@ int main(int argc, const char ** argv) {
         circ_agt.setForwardXVariable("fx");
         circ_agt.setForwardYVariable("fy");
         circ_agt.setForwardZVariable("fz");
-        circ_agt.setModel(flamegpu::visualiser::Stock::Models::ICOSPHERE);
+        circ_agt.setModel(flamegpu::visualiser::Stock::Models::STUNTPLANE);
         circ_agt.setModelScale(env.getProperty<float>("SEPARATION_RADIUS")/3.0f);
+        // Add a settings UI
+        flamegpu::visualiser::PanelVis ui = visualisation.newUIPanel("Environment");
+        ui.newStaticLabel("Interaction");
+        ui.newEnvironmentPropertyDrag<float>("INTERACTION_RADIUS", 0.0f, 0.05f, 0.001f);
+        ui.newEnvironmentPropertyDrag<float>("SEPARATION_RADIUS", 0.0f, 0.05f, 0.001f);
+        ui.newStaticLabel("Environment Scalars");
+        ui.newEnvironmentPropertyDrag<float>("TIME_SCALE", 0.0f, 1.0f, 0.0001f);
+        ui.newEnvironmentPropertyDrag<float>("GLOBAL_SCALE", 0.0f, 0.5f, 0.001f);
+        ui.newStaticLabel("Force Scalars");
+        ui.newEnvironmentPropertyDrag<float>("STEER_SCALE", 0.0f, 10.0f, 0.001f);
+        ui.newEnvironmentPropertyDrag<float>("COLLISION_SCALE", 0.0f, 10.0f, 0.001f);
+        ui.newEnvironmentPropertyDrag<float>("MATCH_SCALE", 0.0f, 10.0f, 0.001f);
     }
     visualisation.activate();
 #endif

diff --git a/examples/boids_bruteforce_dependency_graph/src/main.cu b/examples/boids_bruteforce_dependency_graph/src/main.cu
@@ -307,7 +307,7 @@ FLAMEGPU_AGENT_FUNCTION(inputdata, flamegpu::MessageBruteForce, flamegpu::Messag
 }
 
 int main(int argc, const char ** argv) {
-    flamegpu::ModelDescription model("Boids_BruteForce_DependencyGraph");
+    flamegpu::ModelDescription model("Boids BruteForce (DependencyGraph)");
 
     {   // Location message
         flamegpu::MessageBruteForce::Description &message = model.newMessage("location");
@@ -392,8 +392,23 @@ int main(int argc, const char ** argv) {
         visualisation.setCameraSpeed(0.002f * envWidth);
         auto &circ_agt = visualisation.addAgent("Boid");
         // Position vars are named x, y, z; so they are used by default
-        circ_agt.setModel(flamegpu::visualiser::Stock::Models::ICOSPHERE);
+        circ_agt.setForwardXVariable("fx");
+        circ_agt.setForwardYVariable("fy");
+        circ_agt.setForwardZVariable("fz");
+        circ_agt.setModel(flamegpu::visualiser::Stock::Models::STUNTPLANE);
         circ_agt.setModelScale(env.getProperty<float>("SEPARATION_RADIUS")/3.0f);
+        // Add a settings UI
+        flamegpu::visualiser::PanelVis ui = visualisation.newUIPanel("Environment");
+        ui.newStaticLabel("Interaction");
+        ui.newEnvironmentPropertyDrag<float>("INTERACTION_RADIUS", 0.0f, 0.05f, 0.001f);
+        ui.newEnvironmentPropertyDrag<float>("SEPARATION_RADIUS", 0.0f, 0.05f, 0.001f);
+        ui.newStaticLabel("Environment Scalars");
+        ui.newEnvironmentPropertyDrag<float>("TIME_SCALE", 0.0f, 1.0f, 0.0001f);
+        ui.newEnvironmentPropertyDrag<float>("GLOBAL_SCALE", 0.0f, 0.5f, 0.001f);
+        ui.newStaticLabel("Force Scalars");
+        ui.newEnvironmentPropertyDrag<float>("STEER_SCALE", 0.0f, 10.0f, 0.001f);
+        ui.newEnvironmentPropertyDrag<float>("COLLISION_SCALE", 0.0f, 10.0f, 0.001f);
+        ui.newEnvironmentPropertyDrag<float>("MATCH_SCALE", 0.0f, 10.0f, 0.001f);
     }
     visualisation.activate();
 #endif

diff --git a/examples/boids_rtc_bruteforce/src/main.cu b/examples/boids_rtc_bruteforce/src/main.cu
@@ -351,7 +351,7 @@ FLAMEGPU_AGENT_FUNCTION(inputdata, flamegpu::MessageBruteForce, flamegpu::Messag
 )###";
 
 int main(int argc, const char ** argv) {
-    flamegpu::ModelDescription model("Boids_BruteForce");
+    flamegpu::ModelDescription model("Boids BruteForce (RTC)");
 
     {   // Location message
         flamegpu::MessageBruteForce::Description &message = model.newMessage("location");
@@ -443,8 +443,20 @@ int main(int argc, const char ** argv) {
         circ_agt.setForwardXVariable("fx");
         circ_agt.setForwardYVariable("fy");
         circ_agt.setForwardZVariable("fz");
-        circ_agt.setModel(flamegpu::visualiser::Stock::Models::ICOSPHERE);
+        circ_agt.setModel(flamegpu::visualiser::Stock::Models::STUNTPLANE);
         circ_agt.setModelScale(env.getProperty<float>("SEPARATION_RADIUS")/3.0f);
+        // Add a settings UI
+        flamegpu::visualiser::PanelVis ui = visualisation.newUIPanel("Environment");
+        ui.newStaticLabel("Interaction");
+        ui.newEnvironmentPropertyDrag<float>("INTERACTION_RADIUS", 0.0f, 0.05f, 0.001f);
+        ui.newEnvironmentPropertyDrag<float>("SEPARATION_RADIUS", 0.0f, 0.05f, 0.001f);
+        ui.newStaticLabel("Environment Scalars");
+        ui.newEnvironmentPropertyDrag<float>("TIME_SCALE", 0.0f, 1.0f, 0.0001f);
+        ui.newEnvironmentPropertyDrag<float>("GLOBAL_SCALE", 0.0f, 0.5f, 0.001f);
+        ui.newStaticLabel("Force Scalars");
+        ui.newEnvironmentPropertyDrag<float>("STEER_SCALE", 0.0f, 10.0f, 0.001f);
+        ui.newEnvironmentPropertyDrag<float>("COLLISION_SCALE", 0.0f, 10.0f, 0.001f);
+        ui.newEnvironmentPropertyDrag<float>("MATCH_SCALE", 0.0f, 10.0f, 0.001f);
     }
     visualisation.activate();
 #endif

diff --git a/examples/boids_rtc_spatial3D/src/main.cu b/examples/boids_rtc_spatial3D/src/main.cu
@@ -351,7 +351,7 @@ FLAMEGPU_AGENT_FUNCTION(inputdata, flamegpu::MessageSpatial3D, flamegpu::Message
 )###";
 
 int main(int argc, const char ** argv) {
-    flamegpu::ModelDescription model("Boids_BruteForce");
+    flamegpu::ModelDescription model("Boids Spatial3D (RTC)");
 
     /**
      * GLOBALS
@@ -447,6 +447,18 @@ int main(int argc, const char ** argv) {
         circ_agt.setForwardZVariable("fz");
         circ_agt.setModel(flamegpu::visualiser::Stock::Models::STUNTPLANE);
         circ_agt.setModelScale(env.getProperty<float>("SEPARATION_RADIUS")/3.0f);
+        // Add a settings UI
+        flamegpu::visualiser::PanelVis ui = visualisation.newUIPanel("Environment");
+        ui.newStaticLabel("Interaction");
+        ui.newEnvironmentPropertyDrag<float>("INTERACTION_RADIUS", 0.0f, 0.05f, 0.001f);
+        ui.newEnvironmentPropertyDrag<float>("SEPARATION_RADIUS", 0.0f, 0.05f, 0.001f);
+        ui.newStaticLabel("Environment Scalars");
+        ui.newEnvironmentPropertyDrag<float>("TIME_SCALE", 0.0f, 1.0f, 0.0001f);
+        ui.newEnvironmentPropertyDrag<float>("GLOBAL_SCALE", 0.0f, 0.5f, 0.001f);
+        ui.newStaticLabel("Force Scalars");
+        ui.newEnvironmentPropertyDrag<float>("STEER_SCALE", 0.0f, 10.0f, 0.001f);
+        ui.newEnvironmentPropertyDrag<float>("COLLISION_SCALE", 0.0f, 10.0f, 0.001f);
+        ui.newEnvironmentPropertyDrag<float>("MATCH_SCALE", 0.0f, 10.0f, 0.001f);
     }
     visualisation.activate();
 #endif

diff --git a/examples/boids_spatial3D/src/main.cu b/examples/boids_spatial3D/src/main.cu
@@ -309,7 +309,7 @@ FLAMEGPU_AGENT_FUNCTION(inputdata, flamegpu::MessageSpatial3D, flamegpu::Message
 }
 
 int main(int argc, const char ** argv) {
-    flamegpu::ModelDescription model("boids_spatial3D");
+    flamegpu::ModelDescription model("Boids Spatial3D");
 
     /**
      * GLOBALS
@@ -408,8 +408,20 @@ int main(int argc, const char ** argv) {
         circ_agt.setForwardXVariable("fx");
         circ_agt.setForwardYVariable("fy");
         circ_agt.setForwardZVariable("fz");
-        circ_agt.setModel(flamegpu::visualiser::Stock::Models::ICOSPHERE);
+        circ_agt.setModel(flamegpu::visualiser::Stock::Models::STUNTPLANE);
         circ_agt.setModelScale(env.getProperty<float>("SEPARATION_RADIUS")/3.0f);
+        // Add a settings UI
+        flamegpu::visualiser::PanelVis ui = visualisation.newUIPanel("Environment");
+        ui.newStaticLabel("Interaction");
+        ui.newEnvironmentPropertyDrag<float>("INTERACTION_RADIUS", 0.0f, 0.05f, 0.001f);
+        ui.newEnvironmentPropertyDrag<float>("SEPARATION_RADIUS", 0.0f, 0.05f, 0.001f);
+        ui.newStaticLabel("Environment Scalars");
+        ui.newEnvironmentPropertyDrag<float>("TIME_SCALE", 0.0f, 1.0f, 0.0001f);
+        ui.newEnvironmentPropertyDrag<float>("GLOBAL_SCALE", 0.0f, 0.5f, 0.001f);
+        ui.newStaticLabel("Force Scalars");
+        ui.newEnvironmentPropertyDrag<float>("STEER_SCALE", 0.0f, 10.0f, 0.001f);
+        ui.newEnvironmentPropertyDrag<float>("COLLISION_SCALE", 0.0f, 10.0f, 0.001f);
+        ui.newEnvironmentPropertyDrag<float>("MATCH_SCALE", 0.0f, 10.0f, 0.001f);
     }
     visualisation.activate();
 #endif

diff --git a/examples/circles_bruteforce/src/main.cu b/examples/circles_bruteforce/src/main.cu
@@ -67,7 +67,7 @@ FLAMEGPU_STEP_FUNCTION(Validation) {
 int main(int argc, const char ** argv) {
     NVTX_RANGE("main");
     NVTX_PUSH("ModelDescription");
-    flamegpu::ModelDescription model("Circles_BruteForce_example");
+    flamegpu::ModelDescription model("Circles BruteForce");
 
     const unsigned int AGENT_COUNT = 16384;
     const float ENV_MAX = static_cast<float>(floor(cbrt(AGENT_COUNT)));

diff --git a/examples/circles_spatial3D/src/main.cu b/examples/circles_spatial3D/src/main.cu
@@ -66,7 +66,7 @@ FLAMEGPU_STEP_FUNCTION(Validation) {
     printf("%.2f%% Drift correct\n", 100 * driftDropped / static_cast<float>(driftDropped + driftIncreased));
 }
 int main(int argc, const char ** argv) {
-    flamegpu::ModelDescription model("Circles_BruteForce_example");
+    flamegpu::ModelDescription model("Circles Spatial3D");
 
     const unsigned int AGENT_COUNT = 16384;
     const float ENV_MAX = static_cast<float>(floor(cbrt(AGENT_COUNT)));

diff --git a/examples/game_of_life/src/main.cu b/examples/game_of_life/src/main.cu
@@ -35,7 +35,7 @@ int main(int argc, const char ** argv) {
     const unsigned int AGENT_COUNT = SQRT_AGENT_COUNT * SQRT_AGENT_COUNT;
     NVTX_RANGE("main");
     NVTX_PUSH("ModelDescription");
-    flamegpu::ModelDescription model("Game_of_Life_example");
+    flamegpu::ModelDescription model("Game of Life");
 
     {   // Location message
         flamegpu::MessageArray2D::Description &message = model.newMessage<flamegpu::MessageArray2D>("is_alive_message");

diff --git a/examples/sugarscape/src/main.cu b/examples/sugarscape/src/main.cu
@@ -312,7 +312,7 @@ int main(int argc, const char ** argv) {
         submodel.addExitCondition(MovementExitCondition);
     }
 
-    flamegpu::ModelDescription model("Sugarscape_example");
+    flamegpu::ModelDescription model("Sugarscape");
 
     /**
      * Agents

diff --git a/examples/swig_boids_spatial3D/boids_spatial3D.py b/examples/swig_boids_spatial3D/boids_spatial3D.py
@@ -341,7 +341,7 @@ def clampPosition(x, y, z, MIN_POSITION, MAX_POSITION):
 }
 """
 
-model = pyflamegpu.ModelDescription("Boids_BruteForce");
+model = pyflamegpu.ModelDescription("Boids Spatial3D (Python)");
 
 """
   GLOBALS
@@ -434,6 +434,18 @@ def clampPosition(x, y, z, MIN_POSITION, MAX_POSITION):
     circ_agt.setForwardZVariable("fz");
     circ_agt.setModel(pyflamegpu.STUNTPLANE);
     circ_agt.setModelScale(env.getPropertyFloat("SEPARATION_RADIUS") /3.0);
+    # Add a settings UI
+    ui = visualisation.newUIPanel("Environment");
+    ui.newStaticLabel("Interaction");
+    ui.newEnvironmentPropertyDragFloat("INTERACTION_RADIUS", 0.0, 0.05, 0.001);
+    ui.newEnvironmentPropertyDragFloat("SEPARATION_RADIUS", 0.0, 0.05, 0.001);
+    ui.newStaticLabel("Environment Scalars");
+    ui.newEnvironmentPropertyDragFloat("TIME_SCALE", 0.0, 1.0, 0.0001);
+    ui.newEnvironmentPropertyDragFloat("GLOBAL_SCALE", 0.0, 0.5, 0.001);
+    ui.newStaticLabel("Force Scalars");
+    ui.newEnvironmentPropertyDragFloat("STEER_SCALE", 0.0, 10.0, 0.001);
+    ui.newEnvironmentPropertyDragFloat("COLLISION_SCALE", 0.0, 10.0, 0.001);
+    ui.newEnvironmentPropertyDragFloat("MATCH_SCALE", 0.0, 10.0, 0.001);
     visualisation.activate();
 
 """