From 0fc89aa3ec523d3d06546220bae5393232274e13 Mon Sep 17 00:00:00 2001
From: Lizzy Fleckenstein <eliasfleckenstein@web.de>
Date: Mon, 15 May 2023 23:53:24 +0200
Subject: Blending and liquid source face culling

---
 src/gfx/map.rs      |  9 ++++++++-
 src/gfx/map/mesh.rs | 55 +++++++++++++++++++++++++++++++++--------------------
 src/gfx/state.rs    |  3 +--
 3 files changed, 43 insertions(+), 24 deletions(-)

diff --git a/src/gfx/map.rs b/src/gfx/map.rs
index 8b300dd..7bd5dd3 100644
--- a/src/gfx/map.rs
+++ b/src/gfx/map.rs
@@ -401,7 +401,14 @@ impl MapRender {
                     entry_point: "fs_main",
                     targets: &[Some(wgpu::ColorTargetState {
                         format: state.config.format,
-                        blend: Some(wgpu::BlendState::REPLACE),
+                        blend: Some(wgpu::BlendState {
+                            color: wgpu::BlendComponent {
+                                src_factor: wgpu::BlendFactor::SrcAlpha,
+                                dst_factor: wgpu::BlendFactor::OneMinusSrcAlpha,
+                                operation: wgpu::BlendOperation::Add,
+                            },
+                            alpha: wgpu::BlendComponent::OVER,
+                        }),
                         write_mask: wgpu::ColorWrites::ALL,
                     })],
                 }),
diff --git a/src/gfx/map/mesh.rs b/src/gfx/map/mesh.rs
index e504be4..139b6c7 100644
--- a/src/gfx/map/mesh.rs
+++ b/src/gfx/map/mesh.rs
@@ -24,13 +24,13 @@ impl MeshData {
 pub(super) fn create_mesh(
     mkinfo: &MeshgenInfo,
     settings: &MapRenderSettings,
-    pos: Point3<i16>,
+    _pos: Point3<i16>,
     block: &MapBlock,
     nbors: [Option<&MapBlock>; 6],
     buffer: &mut MeshData,
 ) {
-    for (index, content) in block.param_0.iter().enumerate() {
-        let def = match &mkinfo.nodes[*content as usize] {
+    for (index, &content) in block.param_0.iter().enumerate() {
+        let def = match &mkinfo.nodes[content as usize] {
             Some(x) => x,
             None => continue,
         };
@@ -62,29 +62,42 @@ pub(super) fn create_mesh(
             _ => 1.0,
         };
 
+        let vertices = if def.alpha == mt_net::Alpha::Blend {
+            &mut buffer.vertices_blend
+        } else {
+            &mut buffer.vertices
+        };
+
         let pos: [i16; 3] = array(|i| ((index >> (4 * i)) & 0xf) as i16);
 
         for (f, face) in CUBE.iter().enumerate() {
-            let c = [1, 1, 0, 0, 2, 2][f];
+            if draw_type == DrawType::Cube || draw_type == DrawType::Liquid {
+                let c = [1, 1, 0, 0, 2, 2][f];
 
-            let mut nblk = block;
-            let mut npos = pos;
-            npos[c] += FACE_DIR[f][c];
+                let mut nblk = block;
+                let mut npos = pos;
+                npos[c] += FACE_DIR[f][c];
 
-            if !(0..16).contains(&npos[c]) {
-                nblk = match nbors[f].as_ref() {
-                    Some(x) => x,
-                    None => continue,
-                };
+                if !(0..16).contains(&npos[c]) {
+                    nblk = match nbors[f].as_ref() {
+                        Some(x) => x,
+                        None => continue,
+                    };
 
-                npos[c] = (npos[c] + 16) % 16;
-            }
+                    npos[c] = (npos[c] + 16) % 16;
+                }
 
-            let nidx = npos[0] | (npos[1] << 4) | (npos[2] << 8);
+                let nidx = npos[0] | (npos[1] << 4) | (npos[2] << 8);
+                let ncontent = nblk.param_0[nidx as usize];
 
-            if let Some(ndef) = &mkinfo.nodes[nblk.param_0[nidx as usize] as usize] {
-                if ndef.draw_type == DrawType::Cube {
-                    continue;
+                if let Some(ndef) = &mkinfo.nodes[ncontent as usize] {
+                    if match draw_type {
+                        DrawType::Cube => ndef.draw_type == DrawType::Cube,
+                        DrawType::Liquid => ncontent == content,
+                        _ => false,
+                    } {
+                        continue;
+                    }
                 }
             }
 
@@ -92,7 +105,7 @@ pub(super) fn create_mesh(
             let texture = mkinfo.textures[tile.texture.custom].cube_tex_coords[f];
 
             let mut add_vertex = |vertex: (usize, &([f32; 3], [f32; 2]))| {
-                buffer.vertices.push(Vertex {
+                vertices.push(Vertex {
                     pos: array(|i| pos[i] as f32 + vertex.1 .0[i]),
                     tex_coords: texture[vertex.0],
                     light,
@@ -100,9 +113,9 @@ pub(super) fn create_mesh(
             };
 
             face.iter().enumerate().for_each(&mut add_vertex);
-            /*if !backface_cull {
+            if !tile.flags.contains(mt_net::TileFlag::BackfaceCull) {
                 face.iter().enumerate().rev().for_each(&mut add_vertex);
-            }*/
+            }
         }
     }
 }
diff --git a/src/gfx/state.rs b/src/gfx/state.rs
index 1af6653..b307d85 100644
--- a/src/gfx/state.rs
+++ b/src/gfx/state.rs
@@ -132,8 +132,7 @@ impl State {
             sample_count: 1,
             dimension: wgpu::TextureDimension::D2,
             format: wgpu::TextureFormat::Depth32Float,
-            usage: wgpu::TextureUsages::RENDER_ATTACHMENT // 3.
-				| wgpu::TextureUsages::TEXTURE_BINDING,
+            usage: wgpu::TextureUsages::RENDER_ATTACHMENT | wgpu::TextureUsages::TEXTURE_BINDING,
             view_formats: &[],
         };
         let depth_texture = device.create_texture(&depth_descriptor);
-- 
cgit v1.2.3