Various fixes and auto-versioning

Inochi2D · Jun 6, 2021 · 220052d · 220052d
1 parent 923688d
commit 220052d
Show file tree

Hide file tree

Showing 7 changed files with 100 additions and 3 deletions.
diff --git a/dub.sdl b/dub.sdl
@@ -13,6 +13,8 @@ versions "GL_42" "GL_AllowDeprecated" "USE_SDL2" "USE_GL"
 stringImportPaths "res/"
 stringImportPaths "./"
 
+preBuildCommands "dub run gitver -- --prefix INC --file source/creator/ver.d --mod creator.ver --appname Inochi Creator"
+
 configuration "posix" {
 	targetType "executable"
 }

diff --git a/source/app.d b/source/app.d
@@ -7,6 +7,7 @@
 import std.stdio;
 import std.string;
 import creator.core;
+import creator.core.settings;
 import creator.frames;
 import creator.windows;
 import creator.core.actionstack;
@@ -22,6 +23,10 @@ int main(string[] args)
     incOpenWindow();
     incNewProject();
 
+    if (incSettingsGet!bool("ShowWarning", true)) {
+        incPushWindow(new NoticeWindow());
+    }
+
     while(!incIsCloseRequested()) {
 
         // Update Inochi2D

diff --git a/source/creator/package.d b/source/creator/package.d
@@ -3,6 +3,8 @@ import inochi2d;
 import inochi2d.core.dbg;
 import creator.core.actionstack;
 
+public import creator.ver;
+
 /**
     A project
 */

diff --git a/source/creator/ver.d b/source/creator/ver.d
@@ -0,0 +1,9 @@
+// AUTOGENERATED BY GITVER, DO NOT MODIFY
+module creator.ver;
+
+/**
+	Inochi Version, autogenerated with gitver
+*/
+enum INC_VERSION = "commit+923688d";
+
+// trans rights
diff --git a/source/creator/windows/about.d b/source/creator/windows/about.d
@@ -1,8 +1,10 @@
 module creator.windows.about;
 import creator.windows;
 import creator.core;
+import creator;
 import std.string;
 import creator.utils.link;
+import inochi2d;
 
 class AboutWindow : Window {
 protected:
@@ -28,10 +30,15 @@ protected:
             igSameLine(0, 8);
             igSeparatorEx(ImGuiSeparatorFlags_Vertical);
             igSameLine(0, 8);
+            igBeginChildStr("##LogoTextArea", ImVec2(0, 0), false, 0);
 
-            igPushFont(incBiggerFont());
-                igText("Inochi Creator");
-            igPopFont();
+                igPushFont(incBiggerFont());
+                    igText("Inochi Creator");
+                igPopFont();
+                igText("%s", (INC_VERSION~"\0").ptr);
+                igSeparator();
+                igTextColored(ImVec4(0.5, 0.5, 0.5, 1), "I2D v. %s", (IN_VERSION~"\0").ptr);
+            igEndChild();
         igEndChild();
         igBeginChildStr("##CreditsArea", ImVec2(512, 256), false, 0);
 

diff --git a/source/creator/windows/notice.d b/source/creator/windows/notice.d
@@ -0,0 +1,71 @@
+module creator.windows.notice;
+import creator.windows;
+import creator.core;
+import std.string;
+import creator.utils.link;
+
+class NoticeWindow : Window {
+private:
+    bool doNotShowAgain = false;
+
+protected:
+    override
+    void onBeginUpdate(int id) {
+        flags |= ImGuiWindowFlags_NoResize;
+        super.onBeginUpdate(0);
+    }
+
+    override
+    void onUpdate() {
+
+        igBeginChildStr("##LogoArea", ImVec2(512, 72), false, 0);
+            igImage(
+                cast(void*)incGetLogo(), 
+                ImVec2(64, 64), 
+                ImVec2(0, 0), 
+                ImVec2(1, 1), 
+                ImVec4(1, 1, 1, 1), 
+                ImVec4(0, 0, 0, 0)
+            );
+
+            igSameLine(0, 8);
+            igSeparatorEx(ImGuiSeparatorFlags_Vertical);
+            igSameLine(0, 8);
+
+            igPushFont(incBiggerFont());
+                igText("Inochi Creator");
+            igPopFont();
+        igEndChild();
+        igBeginChildStr("##CreditsArea", ImVec2(512, 232), false, 0);
+
+            igPushFont(incBiggerFont());
+                igTextColored(ImVec4(1, 0, 0, 1), "THIS IS BETA SOFTWARE!");
+            igPopFont();
+            igSpacing();
+            igText("Inochi2D and Inochi Creator is currently under heavy development
+Using Inochi Creator in production is not advised, it *will* crash
+out of nowhere and there's still plenty of bugs to fix.
+
+The Inochi2D project is not to be held liable for broken
+puppet files or crashes resulting from using this beta 
+software.
+
+If you accept this press the \"Close\" button to continue");
+
+        igEndChild();
+
+        if (igCheckbox("Don't show again", &doNotShowAgain)) {
+            incSettingsSet("ShowWarning", !doNotShowAgain);
+        }
+
+        if (igButton("Close", ImVec2(0, 0))) {
+            this.close();
+        }
+
+    }
+
+public:
+    this() {
+        super("Under Construction");
+    }
+}
diff --git a/source/creator/windows/package.d b/source/creator/windows/package.d
@@ -7,6 +7,7 @@ import std.conv;
 public import creator.windows.about;
 public import creator.windows.settings;
 public import creator.windows.texviewer;
+public import creator.windows.notice;
 
 /**
     A Widget