add heightmap override system

.github/workflows/rust-build.yml

@@ -3,7 +3,7 @@ name: rust-build
 on:
   push:
     branches:
-      - master
+      - '*'
     tags-ignore:
       - v*  # don't run on tags since release does that
   pull_request:

engine/src/drawables/terrain.rs

@@ -7,7 +7,7 @@ use wgpu::{
     VertexAttribute, VertexBufferLayout,
 };
 
-use geom::{vec2, vec3, Camera, Intersect3, Matrix4, Vec2, AABB3};
+use geom::{vec2, vec3, Camera, HeightmapChunk, Intersect3, Matrix4, Vec2, AABB3};
 
 use crate::{
     bg_layout_litmesh, pbuffer::PBuffer, CompiledModule, Drawable, FrameContext, GfxContext,
@@ -26,7 +26,7 @@ pub struct TerrainChunk {
 
 /// CSIZE is the size of a chunk in meters
 /// CRESOLUTION is the resolution of a chunk, in vertices, at the chunk data level (not LOD0 since we upsample)
-pub struct TerrainRender<const CSIZE: usize, const CRESOLUTION: usize> {
+pub struct TerrainRender<const CSIZE: u32, const CRESOLUTION: usize> {
     terrain_tex: Arc<Texture>,
     normal_tex: Arc<Texture>,
 
@@ -48,7 +48,7 @@ pub struct TerrainPrepared {
     instances: [(PBuffer, u32); LOD],
 }
 
-impl<const CSIZE: usize, const CRESOLUTION: usize> TerrainRender<CSIZE, CRESOLUTION> {
+impl<const CSIZE: u32, const CRESOLUTION: usize> TerrainRender<CSIZE, CRESOLUTION> {
     const LOD0_RESOLUTION: usize = CRESOLUTION * (1 << UPSCALE_LOD);
 
     pub fn new(gfx: &mut GfxContext, w: u32, h: u32) -> Self {
@@ -161,7 +161,7 @@ impl<const CSIZE: usize, const CRESOLUTION: usize> TerrainRender<CSIZE, CRESOLUT
         &mut self,
         gfx: &mut GfxContext,
         cell: (u32, u32),
-        chunk: &[[f32; CRESOLUTION]; CRESOLUTION],
+        chunk: &HeightmapChunk<CRESOLUTION, CSIZE>,
     ) {
         fn pack(height: f32) -> [u8; 2] {
             let h_encoded = ((height.clamp(MIN_HEIGHT, MAX_HEIGHT) - MIN_HEIGHT)
@@ -172,9 +172,9 @@ impl<const CSIZE: usize, const CRESOLUTION: usize> TerrainRender<CSIZE, CRESOLUT
 
         let mut contents = Vec::with_capacity(CRESOLUTION * CRESOLUTION * 2);
 
-        for ys in chunk.iter() {
-            for &v in ys {
-                contents.extend(pack(v));
+        for y in 0..CRESOLUTION {
+            for x in 0..CRESOLUTION {
+                contents.extend(pack(chunk.height_idx(x, y).unwrap()));
             }
         }
 

engine_demo/src/terrain.rs

@@ -5,7 +5,7 @@ use geom::{vec2, Camera, Heightmap, HeightmapChunk, LinearColor, Vec3};
 
 use crate::DemoElement;
 
-const CSIZE: usize = 512;
+const CSIZE: u32 = 512;
 const CRESO: usize = 16;
 const MAP_SIZE: usize = 50;
 
@@ -58,7 +58,7 @@ impl DemoElement for Terrain {
                 terrain.update_chunk(
                     gfx,
                     (x as u32, y as u32),
-                    h.get_chunk((x as u16, y as u16)).unwrap().heights(),
+                    h.get_chunk((x as u16, y as u16)).unwrap(),
                 );
             }
         }

geom/src/aabb.rs

@@ -52,6 +52,28 @@ impl AABB {
         }
     }
 
+    #[inline]
+    pub fn intersection(self, other: AABB) -> AABB {
+        let v = AABB {
+            ll: self.ll.max(other.ll),
+            ur: self.ur.min(other.ur),
+        };
+        if v.ll.x > v.ur.x || v.ll.y > v.ur.y {
+            AABB::zero()
+        } else {
+            v
+        }
+    }
+
+    #[inline]
+    pub fn offset(self, offset: Vec2) -> AABB {
+        AABB {
+            ll: self.ll + offset,
+            ur: self.ur + offset,
+        }
+    }
+
+    #[inline]
     pub fn size(&self) -> Vec2 {
         self.ur - self.ll
     }

geom/src/aabb3.rs

@@ -49,6 +49,14 @@ impl AABB3 {
         }
     }
 
+    #[inline]
+    pub fn flatten(self) -> AABB {
+        AABB {
+            ll: self.ll.xy(),
+            ur: self.ur.xy(),
+        }
+    }
+
     #[inline]
     pub fn w(&self) -> f32 {
         self.ur.x - self.ll.x

geom/src/circle.rs

@@ -7,6 +7,12 @@ pub struct Circle {
     pub radius: f32,
 }
 
+impl Circle {
+    pub fn contains(&self, p: Vec2) -> bool {
+        self.center.is_close(p, self.radius)
+    }
+}
+
 impl Circle {
     #[inline]
     pub fn new(center: Vec2, radius: f32) -> Self {