Skip to content

Commit a7f678a

Browse files
committed
[update] obj loader.
1 parent ea79609 commit a7f678a

File tree

1 file changed

+9
-30
lines changed

1 file changed

+9
-30
lines changed

tools/obj_loader/src/main.rs

Lines changed: 9 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,14 @@ use lambda::{
1414
WindowEvent,
1515
},
1616
logging,
17-
math::matrix::{
18-
self,
19-
Matrix,
20-
},
2117
render::{
2218
buffer::BufferBuilder,
2319
command::RenderCommand,
2420
mesh::{
2521
Mesh,
2622
MeshBuilder,
2723
},
28-
pipeline::{
29-
PipelineStage,
30-
RenderPipelineBuilder,
31-
},
24+
pipeline::RenderPipelineBuilder,
3225
render_pass::RenderPassBuilder,
3326
shader::{
3427
Shader,
@@ -174,7 +167,10 @@ struct ObjLoader {
174167
impl Component<ComponentResult, String> for ObjLoader {
175168
fn on_event(&mut self, event: Events) -> Result<ComponentResult, String> {
176169
match event {
177-
lambda::events::Events::Window { event, issued_at } => match event {
170+
lambda::events::Events::Window {
171+
event,
172+
issued_at: _,
173+
} => match event {
178174
WindowEvent::Resize { width, height } => {
179175
self.width = width;
180176
self.height = height;
@@ -208,7 +204,7 @@ impl Component<ComponentResult, String> for ObjLoader {
208204
);
209205

210206
let pipeline = RenderPipelineBuilder::new()
211-
.with_immediate_data(PipelineStage::VERTEX, immediate_data_size)
207+
.with_immediate_data(immediate_data_size)
212208
.with_buffer(
213209
BufferBuilder::build_from_mesh(&mesh, gpu)
214210
.expect("Failed to create buffer"),
@@ -231,39 +227,23 @@ impl Component<ComponentResult, String> for ObjLoader {
231227

232228
fn on_detach(
233229
&mut self,
234-
render_context: &mut lambda::render::RenderContext,
230+
_render_context: &mut lambda::render::RenderContext,
235231
) -> Result<ComponentResult, String> {
236232
return Ok(ComponentResult::Success);
237233
}
238234

239235
fn on_update(
240236
&mut self,
241-
last_frame: &std::time::Duration,
237+
_last_frame: &std::time::Duration,
242238
) -> Result<ComponentResult, String> {
243239
self.frame_number += 1;
244240
return Ok(ComponentResult::Success);
245241
}
246242

247243
fn on_render(
248244
&mut self,
249-
render_context: &mut lambda::render::RenderContext,
245+
_render_context: &mut lambda::render::RenderContext,
250246
) -> Vec<lambda::render::command::RenderCommand> {
251-
let camera = [0.0, 0.0, -2.0];
252-
let view: [[f32; 4]; 4] = matrix::translation_matrix(camera);
253-
254-
// Create a projection matrix.
255-
let projection: [[f32; 4]; 4] =
256-
matrix::perspective_matrix(0.12, (4 / 3) as f32, 0.1, 200.0);
257-
258-
// Rotate model.
259-
let model: [[f32; 4]; 4] = matrix::rotate_matrix(
260-
matrix::identity_matrix(4, 4),
261-
[0.0, 1.0, 0.0],
262-
0.001 * self.frame_number as f32,
263-
);
264-
265-
// Create render matrix.
266-
let mesh_matrix = projection.multiply(&view).multiply(&model);
267247
let mesh_matrix =
268248
make_transform([0.0, 0.0, 0.5], self.frame_number as f32 * 0.01, 0.5);
269249

@@ -300,7 +280,6 @@ impl Component<ComponentResult, String> for ObjLoader {
300280
},
301281
RenderCommand::Immediates {
302282
pipeline: render_pipeline.clone(),
303-
stage: PipelineStage::VERTEX,
304283
offset: 0,
305284
bytes: Vec::from(immediate_data_to_bytes(&ImmediateData {
306285
data: [0.0, 0.0, 0.0, 0.0],

0 commit comments

Comments
 (0)