fixed missing imports

KeKsBoTer · Mar 8, 2024 · fab9b16 · fab9b16
1 parent 1326e6a
commit fab9b16
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 16 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -11,8 +11,7 @@ use std::time::{Duration, Instant};
 use wgpu::{util::DeviceExt, Backends, Extent3d};
 
 use cgmath::{
-    Deg, EuclideanSpace, MetricSpace, Point3, Quaternion,
-    Vector2, Vector3,
+    Deg, EuclideanSpace, MetricSpace, Point3, Quaternion, UlpsEq, Vector2, Vector3
 };
 use egui::Color32;
 use num_traits::One;
@@ -464,6 +463,7 @@ impl WindowContext {
                 usage: wgpu::TextureUsages::TEXTURE_BINDING,
                 view_formats: &[],
             },
+            wgpu::util::TextureDataOrder::LayerMajor,
             bytemuck::cast_slice(&env_map_data.as_slice()),
         );
         self.display.set_env_map(&self.wgpu_context.device,Some(&env_texture.create_view(&Default::default())));

diff --git a/src/shaders/preprocess.wgsl b/src/shaders/preprocess.wgsl
@@ -1,4 +1,4 @@
-
+const KERNEL_SIZE:f32 = 0.3;
 //const MAX_SH_DEG:u32 = <injected>u;
 
 const SH_C0:f32 = 0.28209479177387814;
@@ -255,9 +255,9 @@ fn preprocess(@builtin(global_invocation_id) gid: vec3<u32>, @builtin(num_workgr
     let T = W * J;
     let cov = transpose(T) * Vrk * T;
 
-    let diagonal1 = cov[0][0] + 0.3;
+    let diagonal1 = cov[0][0] + KERNEL_SIZE;
     let offDiagonal = cov[0][1];
-    let diagonal2 = cov[1][1] + 0.3;
+    let diagonal2 = cov[1][1] + KERNEL_SIZE;
 
     let mid = 0.5 * (diagonal1 + diagonal2);
     let radius = length(vec2<f32>((diagonal1 - diagonal2) / 2.0, offDiagonal));

diff --git a/src/shaders/preprocess_f32.wgsl b/src/shaders/preprocess_f32.wgsl
@@ -1,6 +1,6 @@
 
 //const MAX_SH_DEG:u32 = <injected>u;
-const KERNEL_SIZE:f32 = 0.1;
+const KERNEL_SIZE:f32 = 0.3;
 
 const SH_C0:f32 = 0.28209479177387814;
 
@@ -206,16 +206,6 @@ fn preprocess(@builtin(global_invocation_id) gid: vec3<u32>, @builtin(num_workgr
     let T = W * J;
     let cov = transpose(T) * Vrk * T;
 
-    // according to Mip-Splatting by Yu et al. 2023
-    let det_0 = max(1e-6, cov[0][0] * cov[1][1] - cov[0][1] * cov[0][1]);
-    let det_1 = max(1e-6, (cov[0][0] + KERNEL_SIZE) * (cov[1][1] + KERNEL_SIZE) - cov[0][1] * cov[0][1]);
-    var coef = sqrt(det_0 / (det_1 + 1e-6) + 1e-6);
-
-    if det_0 <= 1e-6 || det_1 <= 1e-6 {
-        coef = 0.0;
-    }
-    opacity *= coef;
-
     let diagonal1 = cov[0][0] + KERNEL_SIZE;
     let offDiagonal = cov[0][1];
     let diagonal2 = cov[1][1] + KERNEL_SIZE;