mitchellhansen/minimum-viable-game-engine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

got a good obj file, finally

Browse Source
This commit is contained in:
mitchellhansen
2021-07-18 23:42:28 -07:00
parent 00a4a4275a
commit c06d884050
6 changed files with 91 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/geometry.rs
View File

@@ -58,6 +58,11 @@ pub fn load_obj(obj_path: &str) -> Result<RawMesh, String> {
for model in models {
let mesh = &model.mesh;
if let Some(mat_id) = mesh.material_id {
let mat : &Material = materials.get(mat_id).unwrap();
println!("{:?}", mat);
}
// Cycle through the faces and chunk out the indices
let mut next_face = 0;
for f in 0..mesh.num_face_indices.len() {

5
src/render/state.rs
View File

@@ -290,11 +290,6 @@ impl RenderState {
}],
});
/*
There appear to be two passes required for shadows, the shadow pass, and the forward pass
Need to open this up in renderdoc and see what it's actually doing
*/
let shadow_pass = {
let uniform_size = mem::size_of::<ShadowUniforms>() as wgpu::BufferAddress;

2
src/runtime/state.rs
View File

@@ -111,5 +111,7 @@ impl RuntimeState {
self.mesh_cache.insert(filename, mesh);
}
}
panic!("nah");
}
}

106
src/runtime/system.rs
View File

@@ -127,59 +127,59 @@ pub fn runtime_spawn(
) {
for entity in &runtime_state.get_entities() {
match entity.type_name.as_ref() {
"Sprite" => {
let mesh_name = entity.mesh.clone().unwrap();
let raw_mesh = match runtime_state.get_mesh(mesh_name.as_str()) {
None => {
log::warn!("Skipping entity with invalid mesh file {:?} ", mesh_name);
continue;
}
Some(mesh) => mesh,
};
let position = Position::from(entity.position.clone());
let mut static_body = RigidBodyBuilder::new_static()
.position(Isometry3::new(
Vector3::new(position.x, position.y, position.z),
Vector::y(),
))
.build();
let mesh_collider = ColliderBuilder::trimesh(
raw_mesh.vertices.iter().map(|v| v.position()).collect(),
raw_mesh.indices.clone(),
)
.build();
let gpu_mesh_buffer = renderer
.upload_mesh_to_buffer(
raw_mesh,
Some(wgpu::Color {
r: 1.0,
g: 0.7,
b: 0.3,
a: 1.0,
}),
)
.unwrap();
let entity: Entity = cmd.push((
position,
gpu_mesh_buffer,
Physics {
rigid_body: static_body,
rigid_body_handle: None,
},
Collider {
collider: mesh_collider,
collider_handle: None,
},
));
}
// "Sprite" => {
//
//
//
// let mesh_name = entity.mesh.clone().unwrap();
// let raw_mesh = match runtime_state.get_mesh(mesh_name.as_str()) {
// None => {
// log::warn!("Skipping entity with invalid mesh file {:?} ", mesh_name);
// continue;
// }
// Some(mesh) => mesh,
// };
//
// let position = Position::from(entity.position.clone());
//
// let mut static_body = RigidBodyBuilder::new_static()
// .position(Isometry3::new(
// Vector3::new(position.x, position.y, position.z),
// Vector::y(),
// ))
// .build();
//
// let mesh_collider = ColliderBuilder::trimesh(
// raw_mesh.vertices.iter().map(|v| v.position()).collect(),
// raw_mesh.indices.clone(),
// )
// .build();
//
// let gpu_mesh_buffer = renderer
// .upload_mesh_to_buffer(
// raw_mesh,
// Some(wgpu::Color {
// r: 1.0,
// g: 0.7,
// b: 0.3,
// a: 1.0,
// }),
// )
// .unwrap();
//
// let entity: Entity = cmd.push((
// position,
// gpu_mesh_buffer,
// Physics {
// rigid_body: static_body,
// rigid_body_handle: None,
// },
// Collider {
// collider: mesh_collider,
// collider_handle: None,
// },
// ));
// }
"PhysicsEntity" => {
let mesh_name = entity.mesh.as_ref().unwrap();
let raw_mesh = match runtime_state.get_mesh(mesh_name.as_str()) {