Skip to content

Commit

Permalink
Merge branch 'ECS' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
L4ZZA committed Sep 24, 2020
2 parents d2a593f + 48e7d13 commit 37302aa
Show file tree
Hide file tree
Showing 66 changed files with 19,485 additions and 549 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
## Folders
.vs/
bin/
!vendor/premake/bin/
inter/

## Files
Expand Down
47 changes: 47 additions & 0 deletions ember/imgui.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
[Window][Debug##Default]
Pos=60,60
Size=400,400
Collapsed=0

[Window][Settings]
Pos=864,19
Size=416,701
Collapsed=0
DockId=0x00000004,0

[Window][DockSpace Demo]
Size=1280,720
Collapsed=0

[Window][Viewport]
Pos=315,19
Size=547,701
Collapsed=0
DockId=0x00000003,0

[Window][Editor]
Pos=0,0
Size=1280,720
Collapsed=0

[Window][Scene hierarchy panel]
Pos=0,19
Size=313,316
Collapsed=0
DockId=0x00000005,0

[Window][Properties]
Pos=0,337
Size=313,383
Collapsed=0
DockId=0x00000006,0

[Docking][Data]
DockSpace ID=0x582DCB9B Window=0xCB5DF48C Pos=216,258 Size=1280,701 Split=X Selected=0x995B0CF8
DockNode ID=0x00000002 Parent=0x582DCB9B SizeRef=862,701 Split=X
DockNode ID=0x00000001 Parent=0x00000002 SizeRef=313,701 Split=Y Selected=0x556289C7
DockNode ID=0x00000005 Parent=0x00000001 SizeRef=283,316 Selected=0x556289C7
DockNode ID=0x00000006 Parent=0x00000001 SizeRef=283,383 Selected=0xC89E3217
DockNode ID=0x00000003 Parent=0x00000002 SizeRef=547,701 CentralNode=1 HiddenTabBar=1 Selected=0x995B0CF8
DockNode ID=0x00000004 Parent=0x582DCB9B SizeRef=416,701 Selected=0x1C33C293

49 changes: 49 additions & 0 deletions ember/premake5.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@

project "ember"
kind "ConsoleApp"
language "C++"
cppdialect "C++17"
staticruntime "on"

targetdir ("%{wks.location}/bin/" .. outputdir .. "/%{prj.name}")
objdir ("%{wks.location}/inter/" .. outputdir .. "/%{prj.name}")

files
{
"src/**.h",
"src/**.cpp"
}

includedirs
{
"src",
"%{wks.location}/pyro/external/spdlog/include",
"%{wks.location}/pyro/src",
"%{wks.location}/pyro/external",
"%{IncludeDir.glm}",
"%{IncludeDir.ImGui}",
"%{IncludeDir.entt}",
}

links
{
"pyro"
}

filter "system:windows"
systemversion "latest"

filter "configurations:Debug"
defines "PYRO_DEBUG"
runtime "Debug"
symbols "on"

filter "configurations:Release"
defines "PYRO_RELEASE"
runtime "Release"
optimize "on"

filter "configurations:Dist"
defines "PYRO_DIST"
runtime "Release"
optimize "on"
Loading

0 comments on commit 37302aa

Please sign in to comment.