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
5 changes: 5 additions & 0 deletions .github/workflows/build-dispatch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@ on:
description: "Clang tools version to be installed"
required: false
type: string
secrets:
conan_user:
required: true
conan_token:
required: true

jobs:
build:
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/build-validate-android.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,6 @@ jobs:
host-platform: 'windows-latest'
target-platform: 'android'
targets: "${{ matrix.project }}-${{ matrix.pipeline }}-${{ matrix.config }}"
secrets:
conan_user: ${{ secrets.CONAN_USER }}
conan_token: ${{ secrets.CONAN_TOKEN }}
3 changes: 3 additions & 0 deletions .github/workflows/build-validate-emscripten.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,6 @@ jobs:
target-platform: 'web'
targets: "${{ matrix.project }}-${{ matrix.pipeline }}-${{ matrix.config }}"
clang-version: '22'
secrets:
conan_user: ${{ secrets.CONAN_USER }}
conan_token: ${{ secrets.CONAN_TOKEN }}
3 changes: 3 additions & 0 deletions .github/workflows/build-validate-linux.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,6 @@ jobs:
target-platform: 'linux'
targets: "${{ matrix.project }}-${{ matrix.pipeline }}-${{ matrix.config }}"
clang-version: '20'
secrets:
conan_user: ${{ secrets.CONAN_USER }}
conan_token: ${{ secrets.CONAN_TOKEN }}
3 changes: 3 additions & 0 deletions .github/workflows/build-validate-windows.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,6 @@ jobs:
host-platform: 'windows-latest'
target-platform: 'win32'
targets: "${{ matrix.project }}-${{ matrix.pipeline }}-${{ matrix.config }}"
secrets:
conan_user: ${{ secrets.CONAN_USER }}
conan_token: ${{ secrets.CONAN_TOKEN }}
2 changes: 1 addition & 1 deletion source/code/core/devui/private/devui_context.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ namespace ice
ImGui::SetCurrentContext((ImGuiContext*)params.native_context);
return true;
}
#if ISP_WINDOWS
#if ISP_WINDOWS && 0
else if (context_name == "devui-context/imguizmo"_sid)
{
ImGuizmo::SetImGuizmoContext((ImGuizmo::ImGuizmoContext*)params.native_context);
Expand Down
6 changes: 3 additions & 3 deletions source/code/modules/imgui_module/private/imgui_module.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ namespace ice::devui
{
ICE_LOG(LogSeverity::Warning, LogTag::System, "Failed to initialize 'ImGui' context on module!");
}
#if ISP_WINDOWS
#if ISP_WINDOWS && 0
setup_params.native_context = ImGuizmo::GetImGuizmoContext();
if (cb("devui-context/imguizmo"_sid, setup_params, userdata) == false)
{
Expand Down Expand Up @@ -136,7 +136,7 @@ namespace ice::devui

ImGui::SetAllocatorFunctions(imgui_memalloc, imgui_memfree, global_ImGuiAllocator);
ImGui::CreateContext();
#if ISP_WINDOWS
#if ISP_WINDOWS && 0
ImGuizmo::Initialize();
#endif
ice::devui::styles::apply_color_theme(ice::devui::styles::Theme::Dark);
Expand All @@ -149,7 +149,7 @@ namespace ice::devui
{
ice::devui::styles::pop_stylesheet();
ice::devui::styles::pop_color_theme();
#if ISP_WINDOWS
#if ISP_WINDOWS && 0
ImGuizmo::Shutdown();
#endif
ImGui::DestroyContext();
Expand Down
2 changes: 1 addition & 1 deletion source/conanfile.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ msdfgen/1.9.2@iceshard/stable
msdf_atlas_gen/1.2.2@iceshard/stable

# Editor only packages
imguizmo/1.91.3@iceshard/stable
imguizmo/1.91.5@iceshard/stable

[requires-Linux-Clang]
catch2/3.3.2@iceshard/stable
Expand Down