phito/rust-game-engine
2
1
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: phito:4cfb249dd9d0965224231a451dc265c0077b95cb
Branches Tags
phito:master
phito:feature/cube
phito:feature/voxel_container
..
compare: phito:acd7edb9edcd6181551a48560151b4f2d4225b5d
Branches Tags
phito:feature/cube
phito:feature/voxel_container
phito:master

2 Commits
4cfb249dd9 ... acd7edb9ed

Author SHA1 Message Date
Romain
acd7edb9ed Merge remote-tracking branch 'origin/feature/cube' into feature/cube 2023-09-27 22:31:43 +02:00
Romain
4e9848226a Merge remote-tracking branch 'origin/feature/cube' into feature/cube 
# Conflicts:
#	shaders/shader.wgsl
 2023-09-27 22:31:33 +02:00
1 changed files with 1 additions and 57 deletions
Show Stats Expand all files Collapse all files

56
src/cube.rs
View File

@ -56,59 +56,3 @@ pub fn create_vertices() -> (Vec<Vertex>, Vec<u16>) {
(vertex_data.to_vec(), index_data.to_vec()) (vertex_data.to_vec(), index_data.to_vec())
} }
// OLD
/*
use std::mem::size_of;
const CUBE_VERTEX_SIZE: usize = size_of::<f32>() * 10;
const CUBE_VERTEX_COUNT: usize = 36;
const CUBE_VERTEX_POS_OFFSET: usize = 0;
const CUBE_VERTEX_COLOR_OFFSET: usize = size_of::<f32>() * 4;
const CUBE_VERTEX_UV_OFFSET: usize = size_of::<f32>() * 8;
const CUBE_VERTICES: [f32; 24] = [
// float4 position, float4 color, float2 uv
1, -1, 1, 1, 1, 0, 1, 1, 0, 1,
-1, -1, 1, 1, 0, 0, 1, 1, 1, 1,
-1, -1, -1, 1, 0, 0, 0, 1, 1, 0,
1, -1, -1, 1, 1, 0, 0, 1, 0, 0,
1, -1, 1, 1, 1, 0, 1, 1, 0, 1,
-1, -1, -1, 1, 0, 0, 0, 1, 1, 0,
1, 1, 1, 1, 1, 1, 1, 1, 0, 1,
1, -1, 1, 1, 1, 0, 1, 1, 1, 1,
1, -1, -1, 1, 1, 0, 0, 1, 1, 0,
1, 1, -1, 1, 1, 1, 0, 1, 0, 0,
1, 1, 1, 1, 1, 1, 1, 1, 0, 1,
1, -1, -1, 1, 1, 0, 0, 1, 1, 0,
-1, 1, 1, 1, 0, 1, 1, 1, 0, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, -1, 1, 1, 1, 0, 1, 1, 0,
-1, 1, -1, 1, 0, 1, 0, 1, 0, 0,
-1, 1, 1, 1, 0, 1, 1, 1, 0, 1,
1, 1, -1, 1, 1, 1, 0, 1, 1, 0,
-1, -1, 1, 1, 0, 0, 1, 1, 0, 1,
-1, 1, 1, 1, 0, 1, 1, 1, 1, 1,
-1, 1, -1, 1, 0, 1, 0, 1, 1, 0,
-1, -1, -1, 1, 0, 0, 0, 1, 0, 0,
-1, -1, 1, 1, 0, 0, 1, 1, 0, 1,
-1, 1, -1, 1, 0, 1, 0, 1, 1, 0,
1, 1, 1, 1, 1, 1, 1, 1, 0, 1,
-1, 1, 1, 1, 0, 1, 1, 1, 1, 1,
-1, -1, 1, 1, 0, 0, 1, 1, 1, 0,
-1, -1, 1, 1, 0, 0, 1, 1, 1, 0,
1, -1, 1, 1, 1, 0, 1, 1, 0, 0,
1, 1, 1, 1, 1, 1, 1, 1, 0, 1,
1, -1, -1, 1, 1, 0, 0, 1, 0, 1,
-1, -1, -1, 1, 0, 0, 0, 1, 1, 1,
-1, 1, -1, 1, 0, 1, 0, 1, 1, 0,
1, 1, -1, 1, 1, 1, 0, 1, 0, 0,
1, -1, -1, 1, 1, 0, 0, 1, 0, 1,
-1, 1, -1, 1, 0, 1, 0, 1, 1, 0,
];
*/