Skip to content

Commit

Permalink
[mesh_renderer] refactored to anim_renderer. mesh_renderer no longer …
Browse files Browse the repository at this point in the history
…exists
  • Loading branch information
harrand committed Sep 3, 2023
1 parent 65abf5f commit 81ff7b2
Show file tree
Hide file tree
Showing 7 changed files with 96 additions and 96 deletions.
10 changes: 5 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -251,8 +251,8 @@ add_library(topaz STATIC
src/tz/lua/state.hpp

# tz::ren
src/tz/ren/mesh.cpp
src/tz/ren/mesh.hpp
src/tz/ren/anim.cpp
src/tz/ren/anim.hpp
)

if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
Expand Down Expand Up @@ -319,9 +319,9 @@ add_shader(
src/tz/dbgui/empty.vertex.tzsl
src/tz/dbgui/empty.fragment.tzsl

src/tz/ren/shaders/mesh.compute.tzsl
src/tz/ren/shaders/mesh.vertex.tzsl
src/tz/ren/shaders/mesh.fragment.tzsl
src/tz/ren/shaders/anim.compute.tzsl
src/tz/ren/shaders/anim.vertex.tzsl
src/tz/ren/shaders/anim.fragment.tzsl
)

add_subdirectory(demo)
Expand Down
12 changes: 6 additions & 6 deletions demo/gl/tz_mesh_demo/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include "tz/dbgui/dbgui.hpp"
#include "tz/io/gltf.hpp"

#include "tz/ren/mesh.hpp"
#include "tz/ren/anim.hpp"
struct dbgui_data_t
{
bool mesh_renderer_enabled = false;
Expand All @@ -21,9 +21,9 @@ int main()
{
dbgui_init();

tz::ren::mesh_renderer mr;
tz::ren::mesh_renderer::stored_assets sponza = mr.add_gltf(tz::io::gltf::from_file("../../demo/gl/tz_mesh_demo/res/sponza.glb"));
tz::ren::mesh_renderer::mesh_t m;
tz::ren::anim_renderer mr;
tz::ren::anim_renderer::stored_assets sponza = mr.add_gltf(tz::io::gltf::from_file("../../demo/gl/tz_mesh_demo/res/sponza.glb"));
tz::ren::anim_renderer::mesh_t m;
m.indices = {0u, 1u, 2u};
m.vertices =
{
Expand Down Expand Up @@ -71,7 +71,7 @@ int main()
{
if(dbgui_data.mesh_renderer_enabled)
{
if(ImGui::Begin("Mesh Renderer", &dbgui_data.mesh_renderer_enabled))
if(ImGui::Begin("Anim Renderer", &dbgui_data.mesh_renderer_enabled))
{
mr.dbgui();
ImGui::End();
Expand All @@ -90,6 +90,6 @@ void dbgui_init()
{
tz::dbgui::game_menu().add_callback([]()
{
ImGui::MenuItem("Mesh Renderer", nullptr, &dbgui_data.mesh_renderer_enabled);
ImGui::MenuItem("Anim Renderer", nullptr, &dbgui_data.mesh_renderer_enabled);
});
}
Loading

0 comments on commit 81ff7b2

Please sign in to comment.