Skip to content
This repository has been archived by the owner on Sep 27, 2024. It is now read-only.

Refactoring, Settings, Notifications, Lua, Logger & WebSocket #281

Merged
merged 37 commits into from
Mar 15, 2022
Merged

Refactoring, Settings, Notifications, Lua, Logger & WebSocket #281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
737f07b
Refactoring, Settings & Interface
AlexvZyl Mar 4, 2022
5c6c7d1
Minor
AlexvZyl Mar 4, 2022
da4e9f5
Update Application.h
AlexvZyl Mar 4, 2022
c6ebcd7
Trying to fix idle FPS
AlexvZyl Mar 4, 2022
8834308
FPS tool behaviour
AlexvZyl Mar 4, 2022
fa08bc3
minor
AlexvZyl Mar 4, 2022
5870a85
Style & Interface
AlexvZyl Mar 4, 2022
0f1ae93
Bugfixes, Style proper shutdown
AlexvZyl Mar 5, 2022
d8c8399
Update ApplicationEvents.cpp
AlexvZyl Mar 7, 2022
291ac0b
Update ApplicationEvents.cpp
AlexvZyl Mar 7, 2022
689e327
Update ApplicationWindow.cpp
AlexvZyl Mar 7, 2022
56e8406
Update ApplicationWindow.cpp
AlexvZyl Mar 7, 2022
16dd5f6
Fixed Thread Termination & Other Minor
AlexvZyl Mar 7, 2022
11adc7a
Style & Refactoring
AlexvZyl Mar 7, 2022
ab7fc3a
Update README.md
AlexvZyl Mar 7, 2022
b8ecf52
Working on Web sockets
AlexvZyl Mar 7, 2022
c1e8ac6
Update README.md
AlexvZyl Mar 8, 2022
fde1e7c
Working om Socket
AlexvZyl Mar 8, 2022
d4ef5a2
Merge branch 'Alex-Main' of https://github.com/Alex-vZyl/Lumen into A…
AlexvZyl Mar 8, 2022
d2b706d
Implemented WebSockets
AlexvZyl Mar 8, 2022
6d652b6
Dynamically connects to open port
AlexvZyl Mar 9, 2022
162bdfd
Added notify
AlexvZyl Mar 9, 2022
ec36e90
Readded imgui
AlexvZyl Mar 9, 2022
3902d89
Added notifications.
AlexvZyl Mar 9, 2022
fe8e603
Improved notifications and interface
AlexvZyl Mar 9, 2022
dd4e05d
Improved ImGui Events And Interface
AlexvZyl Mar 10, 2022
0167fa4
Added bottom bar & improved stat
AlexvZyl Mar 10, 2022
c3acc99
Improved Asset Explorer
AlexvZyl Mar 10, 2022
eefd39b
Renderer Refactoring
AlexvZyl Mar 11, 2022
33c8b9b
Renderer refactoring
AlexvZyl Mar 11, 2022
d04ea71
Merge branch 'Main' into Alex-Main
AlexvZyl Mar 11, 2022
1bfa378
Lua Scripting Support
AlexvZyl Mar 12, 2022
dc9003d
Lua Python Wrapper, Lua Testing & Bugfix
AlexvZyl Mar 14, 2022
08f0b19
Tweaks
AlexvZyl Mar 14, 2022
15556a2
Added Logger and Working on Websocket
AlexvZyl Mar 15, 2022
94fc9e7
Updated Interface
AlexvZyl Mar 15, 2022
34e4ecd
Update README.md
AlexvZyl Mar 15, 2022
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: 3 additions & 3 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[submodule "ElecDev_Graphics_Application/External/imgui"]
path = ElecDev_Graphics_Application/External/imgui
url = https://github.com/Alex-vZyl/imgui
[submodule "ElecDev_Graphics_Application/External/glm"]
path = ElecDev_Graphics_Application/External/glm
url = https://github.com/Alex-vZyl/glm
[submodule "ElecDev_Graphics_Application/External/implot"]
path = ElecDev_Graphics_Application/External/implot
url = https://github.com/Alex-vZyl/implot
[submodule "ElecDev_Graphics_Application/External/imgui"]
path = ElecDev_Graphics_Application/External/imgui
url = https://github.com/Alex-vZyl/imgui
56 changes: 40 additions & 16 deletions ElecDev_Graphics_Application/ElecDev_Graphics_Application.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,8 @@
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>$(SolutionDir)ElecDev_Graphics_Application\Source\External\GLFW\Libraries;</AdditionalLibraryDirectories>
<AdditionalDependencies>glfw3.lib;opengl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)ElecDev_Graphics_Application\Source\External\GLFW\Libraries;;$(SolutionDir)ElecDev_Graphics_Application\External\lua\Windows</AdditionalLibraryDirectories>
<AdditionalDependencies>glfw3.lib;opengl32.lib;lua54.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Expand All @@ -127,8 +127,8 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>$(SolutionDir)ElecDev_Graphics_Application\Source\External\GLFW\Libraries;</AdditionalLibraryDirectories>
<AdditionalDependencies>glfw3.lib;opengl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)ElecDev_Graphics_Application\Source\External\GLFW\Libraries;;$(SolutionDir)ElecDev_Graphics_Application\External\lua\Windows</AdditionalLibraryDirectories>
<AdditionalDependencies>glfw3.lib;opengl32.lib;lua54.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
Expand All @@ -146,8 +146,8 @@
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>$(SolutionDir)ElecDev_Graphics_Application\Source\External\GLFW\Libraries;C:\Languages\Python_3.10.0\libs</AdditionalLibraryDirectories>
<AdditionalDependencies>glfw3.lib;opengl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)ElecDev_Graphics_Application\Source\External\GLFW\Libraries;C:\Languages\Python_3.10.0\libs;$(SolutionDir)ElecDev_Graphics_Application\External\lua\Windows</AdditionalLibraryDirectories>
<AdditionalDependencies>glfw3.lib;opengl32.lib;lua54.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
Expand All @@ -168,8 +168,8 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>$(SolutionDir)ElecDev_Graphics_Application\Source\External\GLFW\Libraries;</AdditionalLibraryDirectories>
<AdditionalDependencies>glfw3.lib;opengl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)ElecDev_Graphics_Application\Source\External\GLFW\Libraries;;$(SolutionDir)ElecDev_Graphics_Application\External\lua\Windows</AdditionalLibraryDirectories>
<AdditionalDependencies>glfw3.lib;opengl32.lib;lua54.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
Expand All @@ -187,6 +187,8 @@
<ClCompile Include="External\implot\implot.cpp" />
<ClCompile Include="External\implot\implot_demo.cpp" />
<ClCompile Include="External\implot\implot_items.cpp" />
<ClCompile Include="Source\Utilities\Logger\Logger.cpp" />
<ClCompile Include="Source\Utilities\Lua\LuaAPI.cpp" />
<ClCompile Include="Source\Application\ApplicationLayers.cpp" />
<ClCompile Include="Source\Application\ApplicationRender.cpp" />
<ClCompile Include="Source\Application\Layers\LayerStack.cpp" />
Expand All @@ -195,6 +197,7 @@
<ClCompile Include="Source\Application\ApplicationWindow.cpp" />
<ClCompile Include="Source\Application\Events\EventLog.cpp" />
<ClCompile Include="Source\Application\Events\Events.cpp" />
<ClCompile Include="Source\Application\ApplicationNotifications.cpp" />
<ClCompile Include="Source\Engines\Base2DEngine\Base2DEngine_Events.cpp" />
<ClCompile Include="Source\Engines\Design2DEngine\Design2DEngine_Events.cpp" />
<ClCompile Include="Source\Engines\EngineCore\EngineCore_Events.cpp" />
Expand Down Expand Up @@ -233,7 +236,10 @@
<ClCompile Include="Source\External\YAML-CPP\Source\tag.cpp" />
<ClCompile Include="Source\Graphics\Camera\Camera.cpp" />
<ClCompile Include="Source\Graphics\OpenGL\Primitives\TexturedQuad.cpp" />
<ClCompile Include="Source\Graphics\OpenGL\RendererGL.cpp" />
<ClCompile Include="Source\Graphics\OpenGL\Renderer\RendererGL.cpp" />
<ClCompile Include="Source\Graphics\OpenGL\Renderer\RendererGLBuffers.cpp" />
<ClCompile Include="Source\Graphics\OpenGL\Renderer\RendererGLPrimitives.cpp" />
<ClCompile Include="Source\Graphics\OpenGL\Renderer\RendererGLScenes.cpp" />
<ClCompile Include="Source\Graphics\OpenGL\SceneGL.cpp" />
<ClCompile Include="Source\Engines\Design2DEngine\Peripherals\Circuit.cpp" />
<ClCompile Include="Source\Graphics\OpenGL\Primitives\LineSegment.cpp" />
Expand Down Expand Up @@ -262,6 +268,7 @@
<ClCompile Include="Source\External\GLAD\src\glad.c" />
<ClCompile Include="Source\Graphics\Vulkan\README.md" />
<ClCompile Include="Source\GUI\AssetExplorer\AssetExplorer.cpp" />
<ClCompile Include="Source\GUI\BottomBar\BottomBar.cpp" />
<ClCompile Include="Source\GUI\CircuitEditor\CircuitEditor.cpp" />
<ClCompile Include="Source\GUI\ColorEditor\ColorEditor.cpp" />
<ClCompile Include="Source\GUI\ComponentEditor\ComponentEditor.cpp" />
Expand All @@ -272,22 +279,21 @@
<ClCompile Include="Source\GUI\RendererStats\RendererStats.cpp" />
<ClCompile Include="Source\GUI\Ribbon\Ribbon.cpp" />
<ClCompile Include="Source\GUI\SceneHierarchy\SceneHierarchy.cpp" />
<ClCompile Include="Source\GUI\SettingsWidget\SettingsWidget.cpp" />
<ClCompile Include="Source\GUI\Toolbar\toolbar.cpp" />
<ClCompile Include="Source\GUI\UserGUI\UserGUI.cpp" />
<ClCompile Include="Source\Lumen.cpp" />
<ClCompile Include="Source\Resources\resourceHandler.cpp" />
<ClCompile Include="Source\Utilities\Logging\LogHandler.cpp" />
<ClCompile Include="Source\Main.cpp" />
<ClCompile Include="Source\Graphics\OpenGL\Primitives\Text.cpp" />
<ClCompile Include="Source\Utilities\Profiler\Profiler.cpp" />
<ClCompile Include="Source\Utilities\PythonInterface\PythonInterface.cpp" />
<ClCompile Include="Source\Utilities\Serialisation\Entities\CableSerialiser.cpp" />
<ClCompile Include="Source\Utilities\Serialisation\Entities\CircuitSerialiser.cpp" />
<ClCompile Include="Source\Utilities\Serialisation\Entities\Component2DSerialiser.cpp" />
<ClCompile Include="Source\Utilities\Serialisation\Entities\PortSerialiser.cpp" />
<ClCompile Include="Source\Utilities\Serialisation\SerialiserBIN.cpp" />
<ClCompile Include="Source\Utilities\Serialisation\SerialiserUtilities.cpp" />
<ClCompile Include="Source\Utilities\Serialisation\SerialiserYAML.cpp" />
<ClCompile Include="Source\Utilities\WebSocket\LumenWebSocket.cpp" />
<ClCompile Include="Source\Utilities\Windows\WindowsUtilities.cpp" />
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -577,6 +583,7 @@
<ClInclude Include="External\glm\glm\vec3.hpp" />
<ClInclude Include="External\glm\glm\vec4.hpp" />
<ClInclude Include="External\glm\glm\vector_relational.hpp" />
<ClInclude Include="External\imgui-notify\example\src\imgui_notify.h" />
<ClInclude Include="External\imgui\backends\imgui_impl_glfw.h" />
<ClInclude Include="External\imgui\backends\imgui_impl_opengl2.h" />
<ClInclude Include="External\imgui\backends\imgui_impl_opengl3.h" />
Expand All @@ -585,19 +592,33 @@
<ClInclude Include="External\imgui\imconfig.h" />
<ClInclude Include="External\imgui\imgui.h" />
<ClInclude Include="External\imgui\imgui_internal.h" />
<ClInclude Include="External\imgui\imgui_notify.h" />
<ClInclude Include="External\imgui\imstb_rectpack.h" />
<ClInclude Include="External\imgui\imstb_textedit.h" />
<ClInclude Include="External\imgui\imstb_truetype.h" />
<ClInclude Include="External\imgui\misc\cpp\imgui_stdlib.h" />
<ClInclude Include="External\imgui\notify\imgui_notify.h" />
<ClInclude Include="External\imgui\notify\notify_icons_define.h" />
<ClInclude Include="External\imgui\notify\notify_icons_raw.h" />
<ClInclude Include="External\implot\implot.h" />
<ClInclude Include="External\implot\implot_internal.h" />
<ClInclude Include="External\lua\Windows\include\lauxlib.h" />
<ClInclude Include="External\lua\Windows\include\lua.h" />
<ClInclude Include="External\lua\Windows\include\lua.hpp" />
<ClInclude Include="External\lua\Windows\include\luaconf.h" />
<ClInclude Include="External\lua\Windows\include\lualib.h" />
<ClInclude Include="Source\Utilities\Lua\LuaAPI.h" />
<ClInclude Include="Source\Application\Layers\GuiLayer.h" />
<ClInclude Include="Source\Application\Layers\EngineLayer.h" />
<ClInclude Include="Source\Application\Layers\LayerStack.h" />
<ClInclude Include="Source\Application\Layers\Layer.h" />
<ClInclude Include="Source\Application\Events\EventLog.h" />
<ClInclude Include="Source\Application\Events\Events.h" />
<ClInclude Include="Source\Application\Application.h" />
<ClInclude Include="Source\GUI\BottomBar\BottomBar.h" />
<ClInclude Include="Source\GUI\SettingsWidget\SettingsWidget.h" />
<ClInclude Include="Source\Utilities\Lua\LuaInterpreter.h" />
<ClInclude Include="Source\Utilities\Platform\Preprocessor.h" />
<ClInclude Include="Source\Graphics\OpenGL\Buffers\PrimitiveArrayObject.h" />
<ClInclude Include="Source\Engines\Design2DEngine\Peripherals\IOIndicator.h" />
<ClInclude Include="Source\External\YAML-CPP\Includes\yaml-cpp\anchor.h" />
Expand Down Expand Up @@ -662,7 +683,7 @@
<ClInclude Include="Source\Graphics\Camera\Camera.h" />
<ClInclude Include="Source\Graphics\OpenGL\Primitives\TexturedQuad.h" />
<ClInclude Include="Source\Graphics\OpenGL\SceneGL.h" />
<ClInclude Include="Source\Graphics\OpenGL\RendererGL.h" />
<ClInclude Include="Source\Graphics\OpenGL\Renderer\RendererGL.h" />
<ClInclude Include="Source\Engines\Design2DEngine\Peripherals\Circuit.h" />
<ClInclude Include="Source\Graphics\OpenGL\Primitives\LineSegment.h" />
<ClInclude Include="Source\Engines\Design2DEngine\Peripherals\Cable.h" />
Expand Down Expand Up @@ -716,10 +737,10 @@
<ClInclude Include="Source\GUI\Ribbon\Ribbon.h" />
<ClInclude Include="Source\GUI\SceneHierarchy\SceneHierarchy.h" />
<ClInclude Include="Source\GUI\Toolbar\Toolbar.h" />
<ClInclude Include="Source\GUI\UserGUI\UserGUI.h" />
<ClInclude Include="Source\Lumen.h" />
<ClInclude Include="Source\Resources\ResourceHandler.h" />
<ClInclude Include="Source\Utilities\Logging\LogHandler.h" />
<ClInclude Include="Source\Utilities\Platform\Thread.h" />
<ClInclude Include="Source\Utilities\Logger\Logger.h" />
<ClInclude Include="Source\External\Boost\Includes\bind.hpp" />
<ClInclude Include="Source\External\Boost\Includes\bind\apply.hpp" />
<ClInclude Include="Source\External\Boost\Includes\bind\arg.hpp" />
Expand Down Expand Up @@ -798,11 +819,12 @@
<ClInclude Include="Source\GUI\toolbar.h" />
<ClInclude Include="Source\Graphics\OpenGL\Primitives\Text.h" />
<ClInclude Include="Source\Utilities\Profiler\Profiler.h" />
<ClInclude Include="Source\Utilities\PythonInterface\PythonInterface.h" />
<ClInclude Include="Source\Utilities\Serialisation\Serialiser.h" />
<ClInclude Include="Source\Utilities\WebSocket\LumenWebSocket.h" />
<ClInclude Include="Source\Utilities\Windows\WindowsUtilities.h" />
</ItemGroup>
<ItemGroup>
<Library Include="External\lua\Windows\lua54.lib" />
<Library Include="Source\External\GLFW\Libraries\glfw3.lib" />
<Library Include="Source\External\GLFW\Libraries\glfw3dll.lib" />
<Library Include="Source\External\GLFW\Libraries\glfw3_mt.lib" />
Expand Down Expand Up @@ -986,6 +1008,8 @@
<Image Include="Source\Resources\Icons\mainIcon.ico" />
<Image Include="Source\Resources\Icons\panda.bmp" />
<Image Include="Source\Resources\Icons\ReloadIcon.png" />
<Image Include="Source\Resources\Icons\SettingsIcon.png" />
<Image Include="Source\Resources\Icons\UserIcon.png" />
<Image Include="Source\Resources\Textures\CircuitCircle.jpg" />
<Image Include="Source\Resources\Textures\circuitTree.png" />
<Image Include="Source\Resources\Icons\component.png" />
Expand Down
40 changes: 32 additions & 8 deletions ElecDev_Graphics_Application/ElecDev_Graphics_Application.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
<ClCompile Include="Source\Main.cpp">
<Filter>Source</Filter>
</ClCompile>
<ClCompile Include="Source\Utilities\Logging\LogHandler.cpp" />
<ClCompile Include="Source\Engines\Base2DEngine\Base2DEngine.cpp" />
<ClCompile Include="Source\Engines\Base3DEngine\Base3DEngine.cpp" />
<ClCompile Include="Source\Engines\Base3DEngine\Base3DEngine_Events.cpp" />
Expand Down Expand Up @@ -74,7 +73,7 @@
<ClCompile Include="Source\Utilities\Serialisation\Entities\CircuitSerialiser.cpp" />
<ClCompile Include="Source\Utilities\Serialisation\Entities\CableSerialiser.cpp" />
<ClCompile Include="Source\Resources\resourceHandler.cpp" />
<ClCompile Include="Source\Graphics\OpenGL\RendererGL.cpp" />
<ClCompile Include="Source\Graphics\OpenGL\Renderer\RendererGL.cpp" />
<ClCompile Include="Source\Graphics\Camera\Camera.cpp" />
<ClCompile Include="Source\Graphics\OpenGL\SceneGL.cpp" />
<ClCompile Include="Source\Engines\Design2DEngine\Peripherals\IOIndicator.cpp" />
Expand All @@ -94,8 +93,6 @@
<ClCompile Include="Source\GUI\Toolbar\toolbar.cpp" />
<ClCompile Include="Source\GUI\Ribbon\Ribbon.cpp" />
<ClCompile Include="Source\Application\ApplicationRender.cpp" />
<ClCompile Include="Source\Utilities\PythonInterface\PythonInterface.cpp" />
<ClCompile Include="Source\GUI\UserGUI\UserGUI.cpp" />
<ClCompile Include="Source\Lumen.cpp" />
<ClCompile Include="Source\GUI\PopUpMenu\PopUpMenu.cpp" />
<ClCompile Include="Source\Graphics\OpenGL\Primitives\TexturedQuad.cpp" />
Expand All @@ -121,6 +118,15 @@
<ClCompile Include="Source\GUI\ColorEditor\ColorEditor.cpp" />
<ClCompile Include="Source\GUI\SceneHierarchy\SceneHierarchy.cpp" />
<ClCompile Include="Source\GUI\AssetExplorer\AssetExplorer.cpp" />
<ClCompile Include="Source\GUI\SettingsWidget\SettingsWidget.cpp" />
<ClCompile Include="Source\Utilities\WebSocket\LumenWebSocket.cpp" />
<ClCompile Include="Source\Application\ApplicationNotifications.cpp" />
<ClCompile Include="Source\GUI\BottomBar\BottomBar.cpp" />
<ClCompile Include="Source\Utilities\Lua\LuaAPI.cpp" />
<ClCompile Include="Source\Graphics\OpenGL\Renderer\RendererGLBuffers.cpp" />
<ClCompile Include="Source\Graphics\OpenGL\Renderer\RendererGLScenes.cpp" />
<ClCompile Include="Source\Graphics\OpenGL\Renderer\RendererGLPrimitives.cpp" />
<ClCompile Include="Source\Utilities\Logger\Logger.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="Source\External\Boost\Includes\bind\apply.hpp">
Expand Down Expand Up @@ -352,7 +358,7 @@
<Filter>Source</Filter>
</ClInclude>
<ClInclude Include="Source\External\Misc\ConsoleColor.h" />
<ClInclude Include="Source\Utilities\Logging\LogHandler.h" />
<ClInclude Include="Source\Utilities\Logger\Logger.h" />
<ClInclude Include="Source\Engines\Base2DEngine\Base2DEngine.h" />
<ClInclude Include="Source\Engines\Base3DEngine\Base3DEngine.h" />
<ClInclude Include="Source\Engines\EngineCore\EngineCore.h" />
Expand Down Expand Up @@ -456,7 +462,7 @@
<ClInclude Include="Source\External\YAML-CPP\Source\tag.h" />
<ClInclude Include="Source\External\YAML-CPP\Source\token.h" />
<ClInclude Include="Source\Resources\ResourceHandler.h" />
<ClInclude Include="Source\Graphics\OpenGL\RendererGL.h" />
<ClInclude Include="Source\Graphics\OpenGL\Renderer\RendererGL.h" />
<ClInclude Include="Source\Graphics\OpenGL\SceneGL.h" />
<ClInclude Include="Source\Graphics\Camera\Camera.h" />
<ClInclude Include="Source\Engines\Design2DEngine\Peripherals\IOIndicator.h" />
Expand All @@ -473,8 +479,6 @@
<ClInclude Include="Source\Lumen.h" />
<ClInclude Include="Source\GUI\Ribbon\Ribbon.h" />
<ClInclude Include="Source\Application\GuiState.h" />
<ClInclude Include="Source\Utilities\PythonInterface\PythonInterface.h" />
<ClInclude Include="Source\GUI\UserGUI\UserGUI.h" />
<ClInclude Include="Source\Application\Layers\EngineLayer.h" />
<ClInclude Include="Source\GUI\PopUpMenu\PopUpMenu.h" />
<ClInclude Include="Source\Graphics\OpenGL\Primitives\TexturedQuad.h" />
Expand Down Expand Up @@ -785,6 +789,23 @@
<ClInclude Include="Source\GUI\ColorEditor\ColorEditor.h" />
<ClInclude Include="Source\GUI\SceneHierarchy\SceneHierarchy.h" />
<ClInclude Include="Source\GUI\AssetExplorer\AssetExplorer.h" />
<ClInclude Include="Source\Utilities\Platform\Preprocessor.h" />
<ClInclude Include="Source\GUI\SettingsWidget\SettingsWidget.h" />
<ClInclude Include="Source\Utilities\Platform\Thread.h" />
<ClInclude Include="Source\Utilities\WebSocket\LumenWebSocket.h" />
<ClInclude Include="External\imgui-notify\example\src\imgui_notify.h" />
<ClInclude Include="External\imgui\imgui_notify.h" />
<ClInclude Include="External\imgui\notify\imgui_notify.h" />
<ClInclude Include="External\imgui\notify\notify_icons_raw.h" />
<ClInclude Include="External\imgui\notify\notify_icons_define.h" />
<ClInclude Include="Source\GUI\BottomBar\BottomBar.h" />
<ClInclude Include="Source\Utilities\Lua\LuaAPI.h" />
<ClInclude Include="Source\Utilities\Lua\LuaInterpreter.h" />
<ClInclude Include="External\lua\Windows\include\lauxlib.h" />
<ClInclude Include="External\lua\Windows\include\lua.h" />
<ClInclude Include="External\lua\Windows\include\lua.hpp" />
<ClInclude Include="External\lua\Windows\include\luaconf.h" />
<ClInclude Include="External\lua\Windows\include\lualib.h" />
</ItemGroup>
<ItemGroup>
<Library Include="Source\External\GLFW\Libraries\glfw3.lib">
Expand All @@ -796,6 +817,7 @@
<Library Include="Source\External\GLFW\Libraries\glfw3dll.lib">
<Filter>Source</Filter>
</Library>
<Library Include="External\lua\Windows\lua54.lib" />
</ItemGroup>
<ItemGroup>
<None Include="Source\Resources\Shaders\GLSL\basicShader.glsl">
Expand Down Expand Up @@ -1007,6 +1029,8 @@
<Image Include="Source\Resources\Icons\CircuitFileIcon.png" />
<Image Include="Source\Resources\Icons\ReloadIcon.png" />
<Image Include="Source\Resources\Icons\LoadFileIcon.png" />
<Image Include="Source\Resources\Icons\SettingsIcon.png" />
<Image Include="Source\Resources\Icons\UserIcon.png" />
</ItemGroup>
<ItemGroup>
<Filter Include="Source">
Expand Down
2 changes: 1 addition & 1 deletion ElecDev_Graphics_Application/External/imgui
Open in desktop
Submodule imgui updated from 8331ee to 042a6a
Loading