texture and material load, stride fix, ++

gagistech · Jun 18, 2024 · e76a52e · e76a52e
1 parent 066c57c
commit e76a52e
Show file tree

Hide file tree

Showing 7 changed files with 215 additions and 134 deletions.
diff --git a/src/carcockpit/car_widget.cpp b/src/carcockpit/car_widget.cpp
@@ -267,8 +267,8 @@ car_widget::car_widget(utki::shared_ref<ruis::context> context, all_parameters p
 	})
 
 	ruis::render::gltf_loader l(*this->context.get().renderer.get().factory, true);
-	demoscene = l.load(papki::fs_file("../res/samples_gltf/parent_and_children.glb")).to_shared_ptr();
-	// demoscene = l.load(papki::fs_file("../res/samples_gltf/spray.glb")).to_shared_ptr();
+	// demoscene = l.load(papki::fs_file("../res/samples_gltf/parent_and_children.glb")).to_shared_ptr();
+	demoscene = l.load(papki::fs_file("../res/samples_gltf/spray.glb")).to_shared_ptr();
 
 	sc_renderer = std::make_shared<ruis::render::scene_renderer>(this->context);
 	sc_renderer->set_scene(demoscene);

diff --git a/src/carcockpit/shaders/shader_phong.cpp b/src/carcockpit/shaders/shader_phong.cpp
@@ -58,7 +58,7 @@ shader_phong::shader_phong() :
 
 						void main(void)
 						{
-							tc0 = vec2(a1.x, a1.y);
+							tc0 = vec2(a1.x, 1.0 - a1.y);
 							norm = normalize( mat3_n * a2 );	
 							pos = vec3( mat4_mv * a0 );        
 							gl_Position = matrix * a0;