Skip to content

Commit

Permalink
Merge pull request #188 from edunad/features/imgui
Browse files Browse the repository at this point in the history
Add IMGUI support
  • Loading branch information
edunad authored Aug 8, 2024
2 parents 7d303af + d09de14 commit fe8cd6a
Show file tree
Hide file tree
Showing 50 changed files with 680 additions and 106 deletions.
4 changes: 4 additions & 0 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@
- changed-files:
- any-glob-to-any-file: "rawrbox.steamworks/**/*"

"🎨 IMGUI":
- changed-files:
- any-glob-to-any-file: "rawrbox.imgui/**/*"

"📜 SCRIPTING":
- changed-files:
- any-glob-to-any-file:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ jobs:
uses: hendrikmuhs/ccache-action@ed74d11c0b343532753ecead8a951bb09bb34bc9
with:
append-timestamp: false
restore-keys: host-${{ runner.os }}-${{ hashFiles('./CMakeLists.txt', './rawrbox.assimp/CMakeLists.txt', './rawrbox.bass/CMakeLists.txt', './rawrbox.engine/CMakeLists.txt', './rawrbox.math/CMakeLists.txt', './rawrbox.network/CMakeLists.txt', './rawrbox.physics_2d/CMakeLists.txt', './rawrbox.physics_3d/CMakeLists.txt', './rawrbox.render/CMakeLists.txt', './rawrbox.resources/CMakeLists.txt', './rawrbox.scripting/CMakeLists.txt', './rawrbox.ui/CMakeLists.txt', './rawrbox.utils/CMakeLists.txt', './rawrbox.webm/CMakeLists.txt', './rawrbox.steamworks/CMakeLists.txt') }}-
key: host-${{ runner.os }}-${{ hashFiles('./CMakeLists.txt', './rawrbox.assimp/CMakeLists.txt', './rawrbox.bass/CMakeLists.txt', './rawrbox.engine/CMakeLists.txt', './rawrbox.math/CMakeLists.txt', './rawrbox.network/CMakeLists.txt', './rawrbox.physics_2d/CMakeLists.txt', './rawrbox.physics_3d/CMakeLists.txt', './rawrbox.render/CMakeLists.txt', './rawrbox.resources/CMakeLists.txt', './rawrbox.scripting/CMakeLists.txt', './rawrbox.ui/CMakeLists.txt', './rawrbox.utils/CMakeLists.txt', './rawrbox.webm/CMakeLists.txt', './rawrbox.steamworks/CMakeLists.txt') }}
restore-keys: host-${{ runner.os }}-${{ hashFiles('./CMakeLists.txt', './rawrbox.assimp/CMakeLists.txt', './rawrbox.bass/CMakeLists.txt', './rawrbox.engine/CMakeLists.txt', './rawrbox.math/CMakeLists.txt', './rawrbox.network/CMakeLists.txt', './rawrbox.physics_2d/CMakeLists.txt', './rawrbox.physics_3d/CMakeLists.txt', './rawrbox.render/CMakeLists.txt', './rawrbox.resources/CMakeLists.txt', './rawrbox.scripting/CMakeLists.txt', './rawrbox.ui/CMakeLists.txt', './rawrbox.utils/CMakeLists.txt', './rawrbox.webm/CMakeLists.txt', './rawrbox.steamworks/CMakeLists.txt', './rawrbox.imgui/CMakeLists.txt') }}-
key: host-${{ runner.os }}-${{ hashFiles('./CMakeLists.txt', './rawrbox.assimp/CMakeLists.txt', './rawrbox.bass/CMakeLists.txt', './rawrbox.engine/CMakeLists.txt', './rawrbox.math/CMakeLists.txt', './rawrbox.network/CMakeLists.txt', './rawrbox.physics_2d/CMakeLists.txt', './rawrbox.physics_3d/CMakeLists.txt', './rawrbox.render/CMakeLists.txt', './rawrbox.resources/CMakeLists.txt', './rawrbox.scripting/CMakeLists.txt', './rawrbox.ui/CMakeLists.txt', './rawrbox.utils/CMakeLists.txt', './rawrbox.webm/CMakeLists.txt', './rawrbox.steamworks/CMakeLists.txt', './rawrbox.imgui/CMakeLists.txt') }}

- name: CMAKE Setup
id: setup
Expand Down
9 changes: 8 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ option(RAWRBOX_BUILD_RAWRBOX_SCRIPTING "Build lua & mod support" OFF)
option(RAWRBOX_BUILD_RAWRBOX_SCRIPTING_UNSAFE "Enable unsafe scripting (io / etc)" OFF)
option(RAWRBOX_BUILD_RAWRBOX_SCRIPTING_EXCEPTION "Enables scripting throwing exceptions instead of catching them" OFF)
option(RAWRBOX_BUILD_RAWRBOX_STEAMWORKS "Build steamworks support" OFF)
option(RAWRBOX_BUILD_RAWRBOX_IMGUI "Build imgui support" OFF)
option(RAWRBOX_BUILD_MSVC_MULTITHREADED_RUNTIME "Build with msvc multithreading" OFF)
option(RAWRBOX_BUILD_QHULL "Include QHull on utils" OFF)
# ---------------
Expand Down Expand Up @@ -76,6 +77,7 @@ if(RAWRBOX_DEV_MODE)
set(RAWRBOX_BUILD_RAWRBOX_SCRIPTING ON)
set(RAWRBOX_BUILD_RAWRBOX_SCRIPTING_UNSAFE ON)
set(RAWRBOX_BUILD_RAWRBOX_STEAMWORKS ON)
set(RAWRBOX_BUILD_RAWRBOX_IMGUI ON)
set(RAWRBOX_BUILD_QHULL ON)

if(NOT DEFINED STEAMWORKS_APPID)
Expand Down Expand Up @@ -171,7 +173,7 @@ if(NOT WIN32 AND RAWRBOX_USE_WAYLAND)
CPMAddPackage("https://gitlab.freedesktop.org/wayland/[email protected]")
endif()

CPMAddPackage("gh:stephenberry/glaze@3.1.9")
CPMAddPackage("gh:stephenberry/glaze@3.2.1")

# ---
if(RAWRBOX_BUILD_RAWRBOX_NETWORK OR RAWRBOX_BUILD_RAWRBOX_ASSIMP)
Expand Down Expand Up @@ -261,6 +263,11 @@ if(RAWRBOX_BUILD_RAWRBOX_STEAMWORKS)
add_subdirectory("rawrbox.steamworks")
endif()

if(RAWRBOX_BUILD_RAWRBOX_IMGUI)
message(STATUS "Enabled RAWRBOX.IMGUI support")
add_subdirectory("rawrbox.imgui")
endif()

# Shhhhh windows... shhhh....
mute_dependencies_warnings(".*RAWRBOX.*")
# --------------------
Expand Down
16 changes: 13 additions & 3 deletions RAWBOX - Dependencies.drawio
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<mxfile host="65bd71144e" scale="1" border="0" disableSvgWarning="true">
<diagram name="Page-1" id="9xXpQoKFAjOWmioz_WNq">
<mxGraphModel dx="1975" dy="752" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="583" background="none" math="0" shadow="0">
<mxGraphModel dx="1450" dy="515" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="583" background="none" math="0" shadow="0">
<root>
<mxCell id="0"/>
<mxCell id="1" parent="0"/>
Expand Down Expand Up @@ -219,12 +219,22 @@
<mxCell id="43" value="RESOURCES" style="rounded=0;whiteSpace=wrap;html=1;backgroundOutline=0;fillStyle=solid;shadow=1;sketch=1;curveFitting=1;jiggle=2;fillColor=#18141D;fontColor=#F0F0F0;strokeColor=#F0F0F0;" parent="1" vertex="1">
<mxGeometry x="252" y="173" width="120" height="60" as="geometry"/>
</mxCell>
<mxCell id="49" style="edgeStyle=none;sketch=1;hachureGap=4;jiggle=2;curveFitting=1;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;fontFamily=Architects Daughter;fontSource=https%3A%2F%2Ffonts.googleapis.com%2Fcss%3Ffamily%3DArchitects%2BDaughter;fontSize=16;fillColor=#6d8764;strokeColor=#3A5431;" edge="1" parent="1" source="48" target="vDj8au7zf55BE4AIelzE-4">
<mxCell id="49" style="edgeStyle=none;sketch=1;hachureGap=4;jiggle=2;curveFitting=1;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;fontFamily=Architects Daughter;fontSource=https%3A%2F%2Ffonts.googleapis.com%2Fcss%3Ffamily%3DArchitects%2BDaughter;fontSize=16;fillColor=#6d8764;strokeColor=#3A5431;" parent="1" source="48" target="vDj8au7zf55BE4AIelzE-4" edge="1">
<mxGeometry relative="1" as="geometry"/>
</mxCell>
<mxCell id="48" value="STEAMWORKS" style="rounded=0;whiteSpace=wrap;html=1;backgroundOutline=0;fillStyle=solid;shadow=1;sketch=1;curveFitting=1;jiggle=2;fillColor=#18141D;fontColor=#F0F0F0;strokeColor=#F0F0F0;" vertex="1" parent="1">
<mxCell id="48" value="STEAMWORKS" style="rounded=0;whiteSpace=wrap;html=1;backgroundOutline=0;fillStyle=solid;shadow=1;sketch=1;curveFitting=1;jiggle=2;fillColor=#18141D;fontColor=#F0F0F0;strokeColor=#F0F0F0;" parent="1" vertex="1">
<mxGeometry x="60" y="80" width="120" height="29" as="geometry"/>
</mxCell>
<mxCell id="51" style="edgeStyle=none;sketch=1;hachureGap=4;jiggle=2;curveFitting=1;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;fontFamily=Architects Daughter;fontSource=https%3A%2F%2Ffonts.googleapis.com%2Fcss%3Ffamily%3DArchitects%2BDaughter;fontSize=16;rounded=0;dashed=1;fillColor=#fad9d5;strokeColor=#ae4132;" edge="1" parent="1" source="50" target="vDj8au7zf55BE4AIelzE-11">
<mxGeometry relative="1" as="geometry">
<Array as="points">
<mxPoint x="330" y="540"/>
</Array>
</mxGeometry>
</mxCell>
<mxCell id="50" value="IMGUI" style="whiteSpace=wrap;html=1;backgroundOutline=0;rounded=0;fillStyle=solid;shadow=1;sketch=1;curveFitting=1;jiggle=2;fillColor=#18141D;fontColor=#F0F0F0;strokeColor=#F0F0F0;" vertex="1" parent="1">
<mxGeometry x="740" y="524" width="60" height="30" as="geometry"/>
</mxCell>
</root>
</mxGraphModel>
</diagram>
Expand Down
Binary file modified RAWBOX - Dependencies.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit fe8cd6a

Please sign in to comment.