[ren.mesh_renderer] using mesh_renderer directly is once again supported

harrand · Nov 16, 2023 · c45646a · c45646a
1 parent caa4475
commit c45646a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/demo/gl/tz_mesh_demo/main.cpp b/demo/gl/tz_mesh_demo/main.cpp
@@ -6,7 +6,6 @@
 #include "tz/core/matrix_transform.hpp"
 
 #include "tz/ren/mesh.hpp"
-#include "tz/ren/mesh2.hpp"
 struct dbgui_data_t
 {
 	bool mesh_renderer_enabled = false;
@@ -22,8 +21,8 @@ int main()
 	{
 		dbgui_init();
 
-		tz::ren::mesh_renderer2 mr;
-		tz::ren::mesh_renderer2::mesh m;
+		tz::ren::mesh_renderer mr;
+		tz::ren::mesh_renderer::mesh m;
 		m.indices = {0u, 1u, 2u};
 		m.vertices = 
 		{

diff --git a/src/tz/ren/shaders/mesh.vertex.tzsl b/src/tz/ren/shaders/mesh.vertex.tzsl
@@ -48,7 +48,7 @@ resource(id = 2) const buffer camera_buffer
 output(id = 0) vec2 out::texcoord;
 output(id = 1) vec3 out::normal;
 output(id = 2) vec3 out::colour;
-output(id = 3) uvec2 out::impl_unused;
+output(id = 3) vec3 out::impl_unused;
 output(id = 4) texture_locator out::textures[MAX_TEX_COUNT];
 
 void main()