diff --git a/editor/editor-win64.lua b/editor/editor-win64.lua index 42760ee..a17f257 100644 --- a/editor/editor-win64.lua +++ b/editor/editor-win64.lua @@ -84,15 +84,17 @@ local function setupWindows() desktop[0].left = 0 desktop[0].right = (r-l)/2 browserhwnd = SetupBrowser(desktop) + sleep(100) -- Let things setup (window pos etc) + desktop[0].left = (r-l)/2 desktop[0].right = r sokolhwnd = SetupSokolLuajit(desktop) + sleep(100) -- Let things setup (window pos etc) end ------------------------------------------------------------------------------------------------------------ setupWindows() -sleep(100) -- Let things setup (window pos etc) while true do if(user32.IsWindow(browserhwnd) == 0) then break end if(user32.IsWindow(sokolhwnd) == 0) then break end @@ -105,5 +107,5 @@ end if(sokolhwnd) then user32.SendMessageA(sokolhwnd, ffi.C.WM_CLOSE, 0, 0) end -print("Exited") +print("Editor Exited.") ------------------------------------------------------------------------------------------------------------ diff --git a/editor/www/index2.html b/editor/www/index2.html deleted file mode 100644 index 802f767..0000000 --- a/editor/www/index2.html +++ /dev/null @@ -1,142 +0,0 @@ - - - - - Sokol-LuaJIT Editor - - - - - -
-
Scripts
-
Flow
-
Data
-
- -
-

Lua Script Editor

-
-
- -
-

State Flow Editor

-
-
- -
-

Data Manager

-
-
- - - - - - - - - - - - - - diff --git a/editor/www/partials/config_project.html b/editor/www/partials/config_project.html new file mode 100644 index 0000000..e02d60e --- /dev/null +++ b/editor/www/partials/config_project.html @@ -0,0 +1,65 @@ +{% include "/partials/page_header.html" with { page_title: 'Project' } %} + + +
+
+
+
+ Project Setup +
+ +
+ + + + +
+
+

Home Tab

+

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut + labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco + laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in + voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat + cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

+
+
+

Profile Tab

+

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut + labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco + laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in + voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat + cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

+
+
+

Messages Tab

+

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut + labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco + laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in + voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat + cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

+
+
+

Settings Tab

+

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut + labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco + laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in + voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat + cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

+
+
+
+ +
+ +
+ +
diff --git a/editor/www/partials/config_project_js.html b/editor/www/partials/config_project_js.html new file mode 100644 index 0000000..04eaa2b --- /dev/null +++ b/editor/www/partials/config_project_js.html @@ -0,0 +1,69 @@ + + + + + + diff --git a/editor/www/partials/navigation.html b/editor/www/partials/navigation.html index d5187c8..cb10a6c 100644 --- a/editor/www/partials/navigation.html +++ b/editor/www/partials/navigation.html @@ -1,7 +1,7 @@