Skip to content

Commit

Permalink
[imgui] removed imgui completely. i changed my mind
Browse files Browse the repository at this point in the history
  • Loading branch information
harrand committed Nov 16, 2024
1 parent d49cd31 commit e96b782
Show file tree
Hide file tree
Showing 11 changed files with 1 addition and 354 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,3 @@
[submodule "lib/lua"]
path = lib/lua
url = https://github.com/lua/lua
[submodule "lib/imgui"]
path = lib/imgui
url = https://github.com/ocornut/imgui
5 changes: 1 addition & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ topaz_add_library(
TARGET topaz
SOURCES
src/tz/topaz.cpp
src/tz/imgui.cpp
src/tz/core/error.cpp
src/tz/core/job.cpp
src/tz/core/lua.cpp
Expand All @@ -50,16 +49,14 @@ topaz_add_library(
src/tz/io/image.cpp
src/tz/ren/quad.cpp
SHADERS
src/tz/imgui.vertex.tzsl
src/tz/imgui.fragment.tzsl
src/tz/ren/quad.vertex.tzsl
src/tz/ren/quad.fragment.tzsl
DEFINE_PACKAGE
)

target_include_directories(topaz PUBLIC ${PROJECT_SOURCE_DIR}/include)
target_link_libraries(topaz PRIVATE VulkanMemoryAllocator concurrentqueue stb_image lua)
target_link_libraries(topaz PUBLIC textc_lib imgui)
target_link_libraries(topaz PUBLIC textc_lib)

######################
## TOPAZ - SETTINGS ##
Expand Down
3 changes: 0 additions & 3 deletions demo/tz/tz_triangle_demo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
#include "tz/gpu/graph.hpp"
#include "tz/gpu/shader.hpp"

#include "tz/imgui.hpp"

#include ImportedShaderHeader(triangle, vertex)
#include ImportedShaderHeader(triangle, fragment)

Expand Down Expand Up @@ -41,7 +39,6 @@ int tz_main()

tz::gpu::graph_handle graph = tz::gpu::create_graph("Main Graph");
tz::gpu::graph_add_pass(graph, pass);
//tz::gpu::graph_add_subgraph(graph, tz::imgui_render_graph());
tz::gpu::graph_add_pass(graph, tz::gpu::present_pass);

while(tz::os::window_is_open())
Expand Down
13 changes: 0 additions & 13 deletions include/tz/imgui.hpp

This file was deleted.

12 changes: 0 additions & 12 deletions lib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,5 @@ add_library(lua STATIC
)
target_include_directories(lua PUBLIC "${PROJECT_SOURCE_DIR}/lib/lua")

add_library(imgui STATIC
imgui/imgui.cpp
imgui/imgui_demo.cpp
imgui/imgui_draw.cpp
imgui/imgui_tables.cpp
imgui/imgui_widgets.cpp

imgui/misc/cpp/imgui_stdlib.cpp
)
target_include_directories(imgui PUBLIC "${PROJECT_SOURCE_DIR}/lib/imgui")
target_compile_definitions(imgui PUBLIC "-DIMGUI_USER_CONFIG=\"${PROJECT_SOURCE_DIR}/lib/topaz_imgui_config.hpp\"")

add_library(stb_image INTERFACE)
target_include_directories(stb_image INTERFACE stb)
1 change: 0 additions & 1 deletion lib/imgui
Submodule imgui deleted from 8be072
1 change: 0 additions & 1 deletion src/tz/gpu/rhi_vulkan.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3337,7 +3337,6 @@ namespace tz::gpu
#endif

// go through timeline and record all gpu work.
// any of these may or may not try to blit (transfer) an image into our current swapchain image.
for(std::size_t i = 0; i < graph.timeline.size(); i++)
{
const auto& entry = graph.timeline[i];
Expand Down
250 changes: 0 additions & 250 deletions src/tz/imgui.cpp

This file was deleted.

17 changes: 0 additions & 17 deletions src/tz/imgui.fragment.tzsl

This file was deleted.

Loading

0 comments on commit e96b782

Please sign in to comment.