Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions tsd/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,7 @@ project(tsd LANGUAGES C CXX)

## Major dependencies ##

if (TSD_BUILD_INTERACTIVE_APPS)
find_package(anari ${ANARI_REQUIRED_VERSION} REQUIRED COMPONENTS viewer)
else()
find_package(anari ${ANARI_REQUIRED_VERSION} REQUIRED)
endif()
find_package(anari ${ANARI_REQUIRED_VERSION} REQUIRED)

if (TSD_USE_CUDA)
enable_language(CUDA)
Expand Down
2 changes: 1 addition & 1 deletion tsd/apps/interactive/dataTreeEditor/tsdDataTreeEditor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class Application : public TSDApplication

~Application() override = default;

anari_viewer::WindowArray setupWindows() override
tsd::ui::imgui::WindowArray setupWindows() override
{
auto windows = TSDApplication::setupWindows();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class Application : public TSDApplication
Application(int argc, const char *argv[]) : TSDApplication(argc, argv) {}
~Application() override = default;

anari_viewer::WindowArray setupWindows() override
tsd::ui::imgui::WindowArray setupWindows() override
{
auto windows = TSDApplication::setupWindows();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class Application : public TSDApplication
Application(int argc, const char *argv[]) : TSDApplication(argc, argv) {}
~Application() override = default;

anari_viewer::WindowArray setupWindows() override
tsd::ui::imgui::WindowArray setupWindows() override
{
auto windows = TSDApplication::setupWindows();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class Application : public TSDApplication
Application() = default;
~Application() override = default;

anari_viewer::WindowArray setupWindows() override
tsd::ui::imgui::WindowArray setupWindows() override
{
auto windows = TSDApplication::setupWindows();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class Application : public TSDApplication

~Application() override = default;

anari_viewer::WindowArray setupWindows() override
tsd::ui::imgui::WindowArray setupWindows() override
{
auto windows = TSDApplication::setupWindows();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class Application : public TSDApplication
Application() = default;
~Application() override = default;

anari_viewer::WindowArray setupWindows() override
tsd::ui::imgui::WindowArray setupWindows() override
{
auto windows = TSDApplication::setupWindows();

Expand Down
4 changes: 2 additions & 2 deletions tsd/apps/interactive/demos/viskores/tsdDemoViskores.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class Application : public TSDApplication
Application(int argc, const char *argv[]);
~Application() override;

anari_viewer::WindowArray setupWindows() override;
tsd::ui::imgui::WindowArray setupWindows() override;
void uiFrameEnd() override;
void teardown() override;
const char *getDefaultLayout() const override;
Expand All @@ -56,7 +56,7 @@ Application::Application(int argc, const char *argv[])

Application::~Application() = default;

anari_viewer::WindowArray Application::setupWindows()
tsd::ui::imgui::WindowArray Application::setupWindows()
{
ImNodes::CreateContext();

Expand Down
3 changes: 1 addition & 2 deletions tsd/apps/interactive/mpiViewer/DistributedViewport.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

#pragma once

#include "anari_viewer/ui_anari.h"
// SDL
#include <SDL3/SDL.h>
// std
Expand Down Expand Up @@ -47,7 +46,7 @@ struct DistributedViewport : public tsd::ui::imgui::Window
void ui_overlay();
void ui_timeControls();

int windowFlags() const override; // anari_viewer::Window
int windowFlags() const override;

// Data /////////////////////////////////////////////////////////////////////

Expand Down
4 changes: 2 additions & 2 deletions tsd/apps/interactive/mpiViewer/mpiViewer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class Application : public TSDApplication
{}
~Application() override = default;

anari_viewer::WindowArray setupWindows() override
tsd::ui::imgui::WindowArray setupWindows() override
{
auto *log = new tsd::ui::imgui::Log(this, m_controller->appContext());

Expand All @@ -44,7 +44,7 @@ class Application : public TSDApplication
auto *viewport = new tsd::mpi_viewer::DistributedViewport(
this, m_controller, "Viewport");

anari_viewer::WindowArray windows = TSDApplication::setupWindows();
tsd::ui::imgui::WindowArray windows = TSDApplication::setupWindows();
windows.emplace_back(viewport);
windows.emplace_back(log);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class Application : public TSDApplication

~Application() override = default;

anari_viewer::WindowArray setupWindows() override
tsd::ui::imgui::WindowArray setupWindows() override
{
auto windows = TSDApplication::setupWindows();

Expand Down
4 changes: 2 additions & 2 deletions tsd/apps/interactive/network/client/tsdRemoteViewer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ struct Application : public TSDApplication
Application();
~Application() override;

anari_viewer::WindowArray setupWindows() override;
tsd::ui::imgui::WindowArray setupWindows() override;
void uiMainMenuBar() override;
void teardown() override;
const char *getDefaultLayout() const override;
Expand Down Expand Up @@ -110,7 +110,7 @@ Application::~Application()
appContext()->tsd.scene.updateDelegate().erase(m_updateDelegate);
}

anari_viewer::WindowArray Application::setupWindows()
tsd::ui::imgui::WindowArray Application::setupWindows()
{
auto windows = TSDApplication::setupWindows();

Expand Down
2 changes: 1 addition & 1 deletion tsd/apps/interactive/viewer/tsdViewer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class Application : public TSDApplication
Application(int argc, const char *argv[]) : TSDApplication(argc, argv) {}
~Application() override = default;

anari_viewer::WindowArray setupWindows() override
tsd::ui::imgui::WindowArray setupWindows() override
{
auto windows = TSDApplication::setupWindows();

Expand Down
1 change: 1 addition & 0 deletions tsd/external/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ add_subdirectory(
)

if(TSD_BUILD_UI_LIBRARY)
add_subdirectory(tsd_imgui_sdl)
add_subdirectory(tsd_imguizmo)
endif()

Expand Down
50 changes: 50 additions & 0 deletions tsd/external/tsd_imgui_sdl/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
## Copyright 2026 NVIDIA Corporation
## SPDX-License-Identifier: Apache-2.0

project(tsd_ext_imgui_sdl LANGUAGES CXX)

anari_sdk_fetch_project(
NAME ${PROJECT_NAME}
URL https://github.com/ocornut/imgui/archive/refs/tags/v1.91.7-docking.zip
MD5 2cfbf7b7790076d6debe5060ec1fb47f
)

find_package(SDL3 QUIET)
if(NOT TARGET SDL3::SDL3)
mark_as_advanced(SDL3_DIR)
anari_sdk_fetch_project(
NAME tsd_ext_sdl3
URL https://github.com/libsdl-org/SDL/archive/refs/tags/release-3.2.12.zip
MD5 62da6ae22e546cdacdb6dfef520391bf
)
add_subdirectory(
${tsd_ext_sdl3_LOCATION}
${CMAKE_CURRENT_BINARY_DIR}/tsd_ext_sdl3
EXCLUDE_FROM_ALL
)
else()
mark_as_advanced(CLEAR SDL3_DIR)
endif()

project_add_library(STATIC)

project_sources(
PRIVATE
${tsd_ext_imgui_sdl_LOCATION}/imgui.cpp
${tsd_ext_imgui_sdl_LOCATION}/imgui_draw.cpp
${tsd_ext_imgui_sdl_LOCATION}/imgui_demo.cpp
${tsd_ext_imgui_sdl_LOCATION}/imgui_tables.cpp
${tsd_ext_imgui_sdl_LOCATION}/imgui_widgets.cpp
${tsd_ext_imgui_sdl_LOCATION}/backends/imgui_impl_sdl3.cpp
${tsd_ext_imgui_sdl_LOCATION}/backends/imgui_impl_sdlrenderer3.cpp
${tsd_ext_imgui_sdl_LOCATION}/misc/cpp/imgui_stdlib.cpp
)

project_link_libraries(PUBLIC SDL3::SDL3)

project_include_directories(
PUBLIC
${tsd_ext_imgui_sdl_LOCATION}
${tsd_ext_imgui_sdl_LOCATION}/backends
${tsd_ext_imgui_sdl_LOCATION}/misc/cpp
)
4 changes: 2 additions & 2 deletions tsd/external/tsd_imguizmo/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ PUBLIC
project_link_libraries(
PRIVATE
anari::helium
anari::anari_viewer
)
tsd_ext_imgui_sdl
)
Loading
Loading