From 1c6ec0b7b8e437a003137428636149132d998357 Mon Sep 17 00:00:00 2001 From: omniscient <17525998+omnisci3nce@users.noreply.github.com> Date: Mon, 11 Mar 2024 15:35:40 +1100 Subject: added a path_parent function to get path of a file Now we can load .mtl files without hardcoding the full path from top-level like before. that was a hack! --- examples/obj_loading/ex_obj_loading.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'examples') diff --git a/examples/obj_loading/ex_obj_loading.c b/examples/obj_loading/ex_obj_loading.c index d250857..bdadd7e 100644 --- a/examples/obj_loading/ex_obj_loading.c +++ b/examples/obj_loading/ex_obj_loading.c @@ -13,16 +13,17 @@ int main() { // --- Set up our scene // 1. load model from disk - model_handle cube_handle = model_load_obj(core, "assets/models/obj/cube/cube.obj", true); - model* cube = &core->models->data[cube_handle.raw]; + model_handle backpack_handle = + model_load_obj(core, "assets/models/obj/backpack/backpack.obj", true); + model* backpack = &core->models->data[backpack_handle.raw]; // 2. upload vertex data to gpu - model_upload_meshes(&core->renderer, cube); + model_upload_meshes(&core->renderer, backpack); // 3. create a camera vec3 camera_pos = vec3(3., 4., 10.); vec3 camera_front = vec3_normalise(vec3_negate(camera_pos)); camera cam = camera_create(camera_pos, camera_front, VEC3_Y, deg_to_rad(45.0)); - // Main loop + // --- Enter Main loop while (!glfwWindowShouldClose(core->renderer.window)) { input_update(&core->input); threadpool_process_results(&core->threadpool, 1); @@ -31,8 +32,8 @@ int main() { // Draw the cube transform cube_tf = - transform_create(VEC3_ZERO, quat_ident(), 2.5); // make the cube a bit bigger - draw_model(&core->renderer, &cam, cube, cube_tf); + transform_create(VEC3_ZERO, quat_ident(), 2.0); // make the backpack a bit bigger + draw_model(&core->renderer, &cam, backpack, cube_tf); render_frame_end(&core->renderer); } -- cgit v1.2.3-70-g09d2