add config to disable rendering trees

Uriopass · Dec 5, 2023 · d4d2fd6 · d4d2fd6
1 parent 8cb4c16
commit d4d2fd6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/assets/config.json b/assets/config.json
@@ -1,4 +1,5 @@
 {
+  "disable_trees": true,
   "tree_col": {
     "r": 0.17265666,
     "g": 0.40392157,

diff --git a/native_app/src/rendering/map_rendering/trees.rs b/native_app/src/rendering/map_rendering/trees.rs
@@ -5,6 +5,7 @@ use engine::{
     Drawable, FrameContext, GfxContext, InstancedMesh, InstancedMeshBuilder, MeshInstance,
 };
 use geom::{vec3, vec4, Camera, InfiniteFrustrum, Intersect3, LinearColor, Matrix4, Vec3, AABB3};
+use simulation::config;
 use simulation::map::{ChunkID, Map, MapSubscriber, UpdateType, CHUNK_SIZE};
 use std::ops::Mul;
 
@@ -61,6 +62,10 @@ impl TreesRender {
     ) {
         self.build(map, ctx);
 
+        if config().disable_trees {
+            return;
+        }
+
         let camcenter = cam.pos.xy();
 
         struct TreeMesh(InstancedMesh, Vec3);

diff --git a/simulation/src/utils/config.rs b/simulation/src/utils/config.rs
@@ -8,7 +8,10 @@ use std::sync::atomic::{AtomicUsize, Ordering};
 use std::sync::Arc;
 
 #[derive(Default, Clone, Serialize, Deserialize, Inspect)]
+#[serde(default)]
 pub struct Config {
+    pub disable_trees: bool,
+
     pub tree_col: Color,
 
     pub grass_col: Color,