diff --git a/SakuraVNE/src/AppLayer.cpp b/SakuraVNE/src/AppLayer.cpp new file mode 100644 index 0000000..5f838bd --- /dev/null +++ b/SakuraVNE/src/AppLayer.cpp @@ -0,0 +1 @@ +#include "AppLayer.h" diff --git a/SakuraVNE/src/AppLayer.h b/SakuraVNE/src/AppLayer.h new file mode 100644 index 0000000..f6829fb --- /dev/null +++ b/SakuraVNE/src/AppLayer.h @@ -0,0 +1,11 @@ +#include "Layer.h" + +class AppLayer : SakuraVNE::Layer { + AppLayer(); + virtual ~AppLayer(); + +private: + // bool OnMouseButtonPressed(Core::MouseButtonPressedEvent &event); + // bool OnMouseMoved(Core::MouseMovedEvent &event); + // bool OnWindowClosed(Core::WindowClosedEvent &event); +}; diff --git a/SakuraVNE/src/main.cpp b/SakuraVNE/src/main.cpp index 883d1a6..0fe0ba5 100644 --- a/SakuraVNE/src/main.cpp +++ b/SakuraVNE/src/main.cpp @@ -1,12 +1,15 @@ #include "Application.h" int main(int argc, char *argv[]) { - Application app; + AppData appData; + appData.name = "Sakura Visual Novel Creator"; + appData.windowdata.title = appData.name; + appData.windowdata.width = 1280; + appData.windowdata.height = 720; - bool success = app.Init(); - - if (success) - app.Run(); + Application app(appData); + // app.PushLayer(); + app.Run(); return 0; } diff --git a/imgui.ini b/imgui.ini index 68148d1..c105956 100644 --- a/imgui.ini +++ b/imgui.ini @@ -1,8 +1,53 @@ [Window][Debug##Default] Pos=60,60 Size=400,400 +Collapsed=0 [Window][Hello World!] Pos=147,38 Size=311,180 +Collapsed=0 + +[Window][Dear ImGui Demo] +Pos=730,0 +Size=550,720 +Collapsed=0 +DockId=0x00000007,0 + +[Window][Test window] +Size=618,101 +Collapsed=0 +DockId=0x00000001,0 + +[Window][Delta time] +Pos=60,60 +Size=178,67 +Collapsed=0 + +[Window][Calculated Delta time] +Size=1280,101 +Collapsed=0 +DockId=0x00000002,0 + +[Window][WindowOverViewport_11111111] +Pos=0,0 +Size=1280,720 +Collapsed=0 + +[Window][Framerate] +Pos=0,0 +Size=442,720 +Collapsed=0 +DockId=0x00000006,0 + +[Docking][Data] +DockSpace ID=0x08BD597D Window=0x1BBC0F80 Pos=0,0 Size=1280,720 Split=Y + DockNode ID=0x00000003 Parent=0x08BD597D SizeRef=1280,101 Split=X Selected=0xAA1D0058 + DockNode ID=0x00000001 Parent=0x00000003 SizeRef=618,101 Selected=0xAA1D0058 + DockNode ID=0x00000002 Parent=0x00000003 SizeRef=660,101 Selected=0x561EDE67 + DockNode ID=0x00000004 Parent=0x08BD597D SizeRef=1280,617 Split=X + DockNode ID=0x00000005 Parent=0x00000004 SizeRef=728,720 Split=X + DockNode ID=0x00000006 Parent=0x00000005 SizeRef=442,617 Selected=0x0FC82981 + DockNode ID=0x00000008 Parent=0x00000005 SizeRef=284,617 CentralNode=1 + DockNode ID=0x00000007 Parent=0x00000004 SizeRef=550,720 Selected=0x5E5F7166 diff --git a/libs/SakuraCore b/libs/SakuraCore index 51cfab2..fe265c6 160000 --- a/libs/SakuraCore +++ b/libs/SakuraCore @@ -1 +1 @@ -Subproject commit 51cfab26f2e7f81d3be7c615850fd692656c0e7b +Subproject commit fe265c69948837afb5a18983f8c51ce7b16fe761