From 7d72f2b14c712313bc3d9e03a34654e396ef15ca Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alexis=20Laferri=C3=A8re?= Date: Wed, 31 May 2017 09:08:01 -0400 Subject: [PATCH] tinks, model_viewer & action_nitro: print model loading errors and fix one MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Alexis Laferrière --- contrib/action_nitro/src/action_nitro.nit | 1 + contrib/model_viewer/src/model_viewer.nit | 6 ++++-- contrib/tinks/assets/models/debris1.mtl | 2 +- contrib/tinks/src/client/client3d.nit | 11 +++++++++-- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/contrib/action_nitro/src/action_nitro.nit b/contrib/action_nitro/src/action_nitro.nit index a181789..b8dd4f4 100644 --- a/contrib/action_nitro/src/action_nitro.nit +++ b/contrib/action_nitro/src/action_nitro.nit @@ -140,6 +140,7 @@ redef class App # Load 3d models iss_model.load + if iss_model.errors.not_empty then print_error iss_model.errors.join("\n") # Setup cameras world_camera.reset_height 60.0 diff --git a/contrib/model_viewer/src/model_viewer.nit b/contrib/model_viewer/src/model_viewer.nit index 347b565..b93bea4 100644 --- a/contrib/model_viewer/src/model_viewer.nit +++ b/contrib/model_viewer/src/model_viewer.nit @@ -67,8 +67,10 @@ redef class App world_camera.near = 0.1 world_camera.far = 100.0 - for model in models do model.load - for texture in asset_textures_by_name.values do texture.load + for model in models do + model.load + if model.errors.not_empty then print_error model.errors.join("\n") + end # Display the first model model = models[model_index] diff --git a/contrib/tinks/assets/models/debris1.mtl b/contrib/tinks/assets/models/debris1.mtl index 174d51f..d8e32fc 100644 --- a/contrib/tinks/assets/models/debris1.mtl +++ b/contrib/tinks/assets/models/debris1.mtl @@ -9,7 +9,7 @@ Ks 0.287480 0.287480 0.287480 Ni 1.000000 d 1.000000 illum 2 -map_Kd textures/tread.jpg +map_Kd textures/TTread.jpg newmtl Treads Ns 178.431373 diff --git a/contrib/tinks/src/client/client3d.nit b/contrib/tinks/src/client/client3d.nit index 01b2a25..b37fc69 100644 --- a/contrib/tinks/src/client/client3d.nit +++ b/contrib/tinks/src/client/client3d.nit @@ -122,8 +122,15 @@ redef class App show_splash_screen logo # Load everything - for model in models do model.load - for texture in all_root_textures do texture.load + for texture in all_root_textures do + texture.load + var error = texture.error + if error != null then print_error error + end + for model in models do + model.load + if model.errors.not_empty then print_error model.errors.join("\n") + end # Modify all textures so they have a higher ambient color for model in models do -- 1.7.9.5