Skip to content

Commit fe8cd6a

Browse files
edunadedunad
authored
Merge pull request #188 from edunad/features/imgui
Add IMGUI support
2 parents 7d303af + d09de14 commit fe8cd6a

File tree

50 files changed

+680
-106
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+680
-106
lines changed

‎.github/labeler.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,10 @@
5858
- changed-files:
5959
- any-glob-to-any-file: "rawrbox.steamworks/**/*"
6060

61+
"🎨 IMGUI":
62+
- changed-files:
63+
- any-glob-to-any-file: "rawrbox.imgui/**/*"
64+
6165
"📜 SCRIPTING":
6266
- changed-files:
6367
- any-glob-to-any-file:

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ jobs:
3333
uses: hendrikmuhs/ccache-action@ed74d11c0b343532753ecead8a951bb09bb34bc9
3434
with:
3535
append-timestamp: false
36-
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') }}-
37-
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') }}
36+
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') }}-
37+
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') }}
3838

3939
- name: CMAKE Setup
4040
id: setup

‎CMakeLists.txt‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ option(RAWRBOX_BUILD_RAWRBOX_SCRIPTING "Build lua & mod support" OFF)
4343
option(RAWRBOX_BUILD_RAWRBOX_SCRIPTING_UNSAFE "Enable unsafe scripting (io / etc)" OFF)
4444
option(RAWRBOX_BUILD_RAWRBOX_SCRIPTING_EXCEPTION "Enables scripting throwing exceptions instead of catching them" OFF)
4545
option(RAWRBOX_BUILD_RAWRBOX_STEAMWORKS "Build steamworks support" OFF)
46+
option(RAWRBOX_BUILD_RAWRBOX_IMGUI "Build imgui support" OFF)
4647
option(RAWRBOX_BUILD_MSVC_MULTITHREADED_RUNTIME "Build with msvc multithreading" OFF)
4748
option(RAWRBOX_BUILD_QHULL "Include QHull on utils" OFF)
4849
# ---------------
@@ -76,6 +77,7 @@ if(RAWRBOX_DEV_MODE)
7677
set(RAWRBOX_BUILD_RAWRBOX_SCRIPTING ON)
7778
set(RAWRBOX_BUILD_RAWRBOX_SCRIPTING_UNSAFE ON)
7879
set(RAWRBOX_BUILD_RAWRBOX_STEAMWORKS ON)
80+
set(RAWRBOX_BUILD_RAWRBOX_IMGUI ON)
7981
set(RAWRBOX_BUILD_QHULL ON)
8082

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

174-
CPMAddPackage("gh:stephenberry/glaze@3.1.9")
176+
CPMAddPackage("gh:stephenberry/glaze@3.2.1")
175177

176178
# ---
177179
if(RAWRBOX_BUILD_RAWRBOX_NETWORK OR RAWRBOX_BUILD_RAWRBOX_ASSIMP)
@@ -261,6 +263,11 @@ if(RAWRBOX_BUILD_RAWRBOX_STEAMWORKS)
261263
add_subdirectory("rawrbox.steamworks")
262264
endif()
263265

266+
if(RAWRBOX_BUILD_RAWRBOX_IMGUI)
267+
message(STATUS "Enabled RAWRBOX.IMGUI support")
268+
add_subdirectory("rawrbox.imgui")
269+
endif()
270+
264271
# Shhhhh windows... shhhh....
265272
mute_dependencies_warnings(".*RAWRBOX.*")
266273
# --------------------

‎RAWBOX - Dependencies.drawio‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<mxfile host="65bd71144e" scale="1" border="0" disableSvgWarning="true">
22
<diagram name="Page-1" id="9xXpQoKFAjOWmioz_WNq">
3-
<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">
3+
<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">
44
<root>
55
<mxCell id="0"/>
66
<mxCell id="1" parent="0"/>
@@ -219,12 +219,22 @@
219219
<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">
220220
<mxGeometry x="252" y="173" width="120" height="60" as="geometry"/>
221221
</mxCell>
222-
<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">
222+
<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">
223223
<mxGeometry relative="1" as="geometry"/>
224224
</mxCell>
225-
<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">
225+
<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">
226226
<mxGeometry x="60" y="80" width="120" height="29" as="geometry"/>
227227
</mxCell>
228+
<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">
229+
<mxGeometry relative="1" as="geometry">
230+
<Array as="points">
231+
<mxPoint x="330" y="540"/>
232+
</Array>
233+
</mxGeometry>
234+
</mxCell>
235+
<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">
236+
<mxGeometry x="740" y="524" width="60" height="30" as="geometry"/>
237+
</mxCell>
228238
</root>
229239
</mxGraphModel>
230240
</diagram>

‎RAWBOX - Dependencies.png‎

9.65 KB
Loading

0 commit comments

Comments
 (0)