client: generate normals

2 files changed, 55 insertions, 11 deletions

diff --git a/client/src/meshops.rs b/client/src/meshops.rs
index e76e02a..38c6c7b 100644
--- a/client/src/meshops.rs
+++ b/client/src/meshops.rs
@@ -1,4 +1,4 @@
-use glam::{Vec2, Vec3, Vec3A};
+use glam::{Vec2, Vec3};
 
 pub fn generate_normals(index: &[[u32; 3]], position: &[Vec3]) -> Vec<Vec3> {
     let mut normal_denom = vec![0; position.len()];
@@ -19,10 +19,9 @@ pub fn generate_normals(index: &[[u32; 3]], position: &[Vec3]) -> Vec<Vec3> {
         normal_denom[b as usize] += 1;
         normal_denom[c as usize] += 1;
     }
-    for (denom, tang) in normal_denom.iter().zip(normal.iter_mut()) {
-        *tang /= *denom as f32;
+    for (denom, norm) in normal_denom.iter().zip(normal.iter_mut()) {
+        *norm /= *denom as f32;
     }
-
     normal
 }
 
@@ -57,7 +56,7 @@ pub fn generate_tangents(index: &[[u32; 3]], position: &[Vec3], texcoord: &[Vec2
     tangent
 }
 
-pub fn generate_texcoords(index: &[[u32; 3]], position: &[Vec3A]) -> Vec<Vec2> {
+pub fn generate_texcoords(index: &[[u32; 3]], position: &[Vec3]) -> Vec<Vec2> {
     let _ = (index, position);
     // TODO implement equirectangular projection
     todo!()
diff --git a/client/src/scene_prepare.rs b/client/src/scene_prepare.rs
index 8941fa7..4cf6c87 100644
--- a/client/src/scene_prepare.rs
+++ b/client/src/scene_prepare.rs
@@ -14,10 +14,13 @@
     You should have received a copy of the GNU Affero General Public License
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
-use crate::{download::Downloader, meshops::generate_tangents};
+use crate::{
+    download::Downloader,
+    meshops::{generate_normals, generate_tangents, generate_texcoords},
+};
 use anyhow::Result;
 use egui::{Grid, Widget};
-use glam::{Vec2, Vec3, Vec3A};
+use glam::{Vec2, Vec3};
 use humansize::DECIMAL;
 use image::ImageReader;
 use log::{debug, trace};
@@ -119,12 +122,12 @@ struct TangentBufferSpec {
 #[derive(Debug, Clone, Hash, PartialEq, Eq)]
 struct NormalBufferSpec {
     index: Resource<Vec<[u32; 3]>>,
-    position: Resource<Vec<Vec3A>>,
+    position: Resource<Vec<Vec3>>,
 }
 #[derive(Debug, Clone, Hash, PartialEq, Eq)]
 struct TexcoordBufferSpec {
     index: Resource<Vec<[u32; 3]>>,
-    position: Resource<Vec<Vec3A>>,
+    position: Resource<Vec<Vec3>>,
 }
 
 #[derive(Debug, Clone, Copy, Hash, PartialEq, Eq)]
@@ -260,6 +263,42 @@ impl ScenePreparer {
                 );
             }
         }
+        for spec in self.generated_normal_buffers.needed() {
+            if let (Some(index), Some(position)) = (
+                dls.try_get(spec.index.clone())?,
+                dls.try_get(spec.position.clone())?,
+            ) {
+                let normals = generate_normals(&index, &position);
+                let buffer = self.device.create_buffer_init(&BufferInitDescriptor {
+                    label: None,
+                    usage: BufferUsages::COPY_DST | BufferUsages::VERTEX,
+                    contents: bytemuck::cast_slice(normals.as_slice()),
+                });
+                self.generated_normal_buffers.insert(
+                    spec,
+                    Arc::new(buffer),
+                    size_of::<f32>() * normals.len() * 3,
+                );
+            }
+        }
+        for spec in self.generated_texcoord_buffers.needed() {
+            if let (Some(index), Some(position)) = (
+                dls.try_get(spec.index.clone())?,
+                dls.try_get(spec.position.clone())?,
+            ) {
+                let texcoords = generate_texcoords(&index, &position);
+                let buffer = self.device.create_buffer_init(&BufferInitDescriptor {
+                    label: None,
+                    usage: BufferUsages::COPY_DST | BufferUsages::VERTEX,
+                    contents: bytemuck::cast_slice(texcoords.as_slice()),
+                });
+                self.generated_texcoord_buffers.insert(
+                    spec,
+                    Arc::new(buffer),
+                    size_of::<f32>() * texcoords.len() * 3,
+                );
+            }
+        }
         for pres in self.mesh_parts.needed() {
             let start = Instant::now();
             if let Some(part) = dls.try_get(pres.clone())? {
@@ -272,13 +311,19 @@ impl ScenePreparer {
                     let normal = if let Some(res) = part.va_normal.clone() {
                         self.vertex_buffers.try_get(Resource(res.0, PhantomData))
                     } else {
-                        todo!()
+                        self.generated_normal_buffers.try_get(NormalBufferSpec {
+                            index: indexres.clone(),
+                            position: Resource(positionres.0, PhantomData),
+                        })
                     };
 
                     let texcoord = if let Some(res) = part.va_texcoord.clone() {
                         self.vertex_buffers.try_get(Resource(res.0, PhantomData))
                     } else {
-                        todo!()
+                        self.generated_texcoord_buffers.try_get(TexcoordBufferSpec {
+                            index: indexres.clone(),
+                            position: Resource(positionres.0, PhantomData),
+                        })
                     };
                     let tangent = if let Some(res) = part.va_tangent.clone() {
                         self.vertex_buffers.try_get(Resource(res.0, PhantomData))