update engine

upf-gti · Oct 23, 2024 · b049b24 · b049b24
1 parent 37c6fd5
commit b049b24
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 20 deletions.
diff --git a/libraries/wgpuEngine b/libraries/wgpuEngine
diff --git a/src/engine/sample_engine.cpp b/src/engine/sample_engine.cpp
@@ -37,25 +37,25 @@ int SampleEngine::post_initialize()
     }
 
     // Create grid
-    {
-        MeshInstance3D* grid = new MeshInstance3D();
-        grid->set_name("Grid");
-        grid->add_surface(RendererStorage::get_surface("quad"));
-        grid->set_position(glm::vec3(0.0f));
-        grid->rotate(glm::radians(90.0f), glm::vec3(1.0f, 0.0f, 0.0f));
-        grid->scale(glm::vec3(10.f));
-        grid->set_frustum_culling_enabled(false);
-
-        // NOTE: first set the transparency and all types BEFORE loading the shader
-        Material* grid_material = new Material();
-        grid_material->set_transparency_type(ALPHA_BLEND);
-        grid_material->set_cull_type(CULL_NONE);
-        grid_material->set_type(MATERIAL_UNLIT);
-        grid_material->set_shader(RendererStorage::get_shader_from_source(shaders::mesh_grid::source, shaders::mesh_grid::path, grid_material));
-        grid->set_surface_material_override(grid->get_surface(0), grid_material);
-
-        main_scene->add_node(grid);
-    }
+    //{
+    //    MeshInstance3D* grid = new MeshInstance3D();
+    //    grid->set_name("Grid");
+    //    grid->add_surface(RendererStorage::get_surface("quad"));
+    //    grid->set_position(glm::vec3(0.0f));
+    //    grid->rotate(glm::radians(90.0f), glm::vec3(1.0f, 0.0f, 0.0f));
+    //    grid->scale(glm::vec3(10.f));
+    //    grid->set_frustum_culling_enabled(false);
+
+    //    // NOTE: first set the transparency and all types BEFORE loading the shader
+    //    Material* grid_material = new Material();
+    //    grid_material->set_transparency_type(ALPHA_BLEND);
+    //    grid_material->set_cull_type(CULL_NONE);
+    //    grid_material->set_type(MATERIAL_UNLIT);
+    //    grid_material->set_shader(RendererStorage::get_shader_from_source(shaders::mesh_grid::source, shaders::mesh_grid::path, grid_material));
+    //    grid->set_surface_material_override(grid->get_surface(0), grid_material);
+
+    //    main_scene->add_node(grid);
+    //}
 
     return 0;
 }
+5 −1		data/shaders/mesh_forward.wgsl
+0 −45		data/shaders/mesh_outline.wgsl
+1 −2		data/shaders/mesh_transparent.wgsl
+1 −1		libraries/Vulkan-Headers
+1 −0		src/framework/animation/interpolator.cpp
+1 −1		src/framework/nodes/button_2d.cpp
+12 −12		src/framework/nodes/container_2d.cpp
+6 −6		src/framework/nodes/container_2d.h
+31 −1		src/framework/nodes/node_2d.cpp
+7 −1		src/framework/nodes/node_2d.h
+10 −7		src/framework/nodes/panel_2d.cpp
+2 −2		src/framework/nodes/panel_2d.h
+2 −2		src/framework/nodes/skeleton_instance_3d.cpp
+1 −1		src/framework/nodes/text.cpp
+1 −1		src/framework/nodes/text.h
+1 −11		src/framework/nodes/viewport_3d.cpp
+2 −2		src/framework/nodes/viewport_3d.h
+72 −11		src/framework/parsers/parse_gltf.cpp
+1 −1		src/framework/parsers/parse_gltf.h
+2 −2		src/framework/parsers/parse_obj.cpp
+3 −3		src/framework/parsers/parse_scene.cpp
+2 −2		src/framework/parsers/parse_scene.h
+8 −0		src/framework/ui/gizmo_3d.cpp
+1 −0		src/framework/ui/gizmo_3d.h
+10 −8		src/framework/ui/ui_utils.h
+4 −0		src/graphics/pipeline.h
+198 −185		src/graphics/surface.cpp
+23 −5		src/graphics/surface.h
+5 −0		src/graphics/texture.h
+4 −1		src/xr/openxr_context.cpp