move to opengl to remove wgpu

Author: coderedart

Cargo.lock

@@ -7,6 +7,7 @@ members = [
     "crates/jokoapi",
     "crates/jokolay",
     "crates/joko_core",
+    "crates/joko_ext",
 ]
 resolver = "2"
 

Cargo.toml

@@ -0,0 +1,8 @@
+[package]
+name = "joko_ext"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]

crates/joko_ext/Cargo.toml

@@ -0,0 +1,14 @@
+pub fn add(left: usize, right: usize) -> usize {
+    left + right
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn it_works() {
+        let result = add(2, 2);
+        assert_eq!(result, 4);
+    }
+}

crates/joko_ext/src/lib.rs

@@ -6,11 +6,10 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-egui_render_wgpu = { version = "0.5" }
+egui_render_three_d = { version = "*" }
 egui_window_glfw_passthrough = { version = "0.5" }
 bytemuck = { version = "1", default-features = false }
 jokolink = { path = "../jokolink" }
-pollster = { version = "*" }
 glam = { workspace = true, features = ["bytemuck"] }
 tracing = { workspace = true }
 serde = { workspace = true }

crates/joko_render/Cargo.toml

@@ -0,0 +1,18 @@
+#version 450
+
+layout(location = 0) in vec2 vtex_coord;
+layout(location = 1) in float valpha;
+layout(location = 2) in vec4 vcolor;
+
+layout(location = 0) out vec4 ocolor;
+
+layout(location = 1) uniform sampler2D sam;
+
+void main() {
+    vec4 color = texture(sam, vtex_coord, -2.0);
+    color.a = color.a * valpha;
+    if (color.a < 0.01) {
+        discard;
+    }
+    ocolor = color;
+}

crates/joko_render/shaders/marker.fs

@@ -0,0 +1,39 @@
+#version 450
+
+layout(location = 0) in vec4 position;
+layout(location = 1) in float alpha;
+layout(location = 2) in vec2 tex_coord;
+layout(location = 3) in vec2 fade_near_far;
+layout(location = 4) in vec4 color;
+
+layout(location = 0) out vec2 vtex_coord;
+layout(location = 1) out float valpha;
+layout(location = 2) out vec4 vcolor;
+
+
+layout(location = 0) uniform vec3 camera_pos;
+// location 1 is for sampler in frag shader
+layout(location = 2) uniform mat4 transform;
+
+
+void main(
+)  {
+    valpha = alpha;
+    vtex_coord = tex_coord;
+    gl_Position = transform * position;
+    vcolor = color;
+
+    float dist = distance(camera_pos, position.xyz);
+    if (fade_near_far.x > 0.0 && dist >= fade_near_far.x) {
+            // if distance is exactly fade_near, we will multiply with 1.0
+            // if its more, then we will multiply with how far we are in between fade_near and fade_far
+        float ratio = 1.0 - (abs(dist - fade_near_far.x) / abs(fade_near_far.y - fade_near_far.x));
+            // The actual alpha
+        valpha *= ratio;
+    }
+    if (fade_near_far.y > 0.0 && dist >= fade_near_far.y) {
+        valpha = 0.0;
+    }
+}
+
+

crates/joko_render/shaders/marker.vs

@@ -1,60 +0,0 @@
-struct VertexInput {
-    @location(0) position: vec4<f32>,
-    @location(1) tex_coord: vec2<f32>,
-    @location(2) alpha: f32,
-    @location(3) color: vec4<f32>,
-    @location(4) fade_near_far: vec2<f32>,
-}
-struct VertexOutput {
-    @location(0) tex_coord: vec2<f32>,
-    @location(1) alpha: f32,
-    @location(2) color: vec4<f32>,
-    @builtin(position) position: vec4<f32>,
-};
-struct UniformInput {
-    transform: mat4x4<f32>,
-    player_pos: vec3<f32>,
-}
-
-@group(0)
-@binding(0)
-var<uniform> uni: UniformInput;
-
-@vertex
-fn vs_main(
-    vin: VertexInput
-) -> VertexOutput {
-    var result: VertexOutput;
-    result.alpha = vin.alpha;
-
-    var dist = distance(uni.player_pos, vin.position.xyz);
-    if vin.fade_near_far.x > 0.0 && dist >= vin.fade_near_far.x {
-            // if distance is exactly fade_near, we will multiply with 1.0
-            // if its more, then we will multiply with how far we are in between fade_near and fade_far
-        var ratio = 1.0 - (abs(dist - vin.fade_near_far.x) / abs(vin.fade_near_far.y - vin.fade_near_far.x));
-            // The actual alpha
-        result.alpha *= ratio;
-    }
-    if vin.fade_near_far.y > 0.0 && dist >= vin.fade_near_far.y {
-        result.alpha = 0.0;
-    }
-    result.tex_coord = vin.tex_coord;
-    result.position = uni.transform * vin.position;
-    result.color = vin.color;
-
-    return result;
-}
-
-@group(1) @binding(0) var r_tex_color: texture_2d<f32>;
-@group(1) @binding(1) var r_tex_sampler: sampler;
-
-@fragment
-fn fs_main(vout: VertexOutput) -> @location(0) vec4<f32> {
-    var color: vec4<f32> = textureSampleBias(r_tex_color, r_tex_sampler, vout.tex_coord, -2.0);
-    color.a = color.a * vout.alpha;
-    if color.a < 0.01 {
-        discard;
-    }
-    return color;
-}
-