Merge pull request Inochi2D#6 from LunaTheFoxgirl/main

Various cleanup to comply with Inochi2D branding guidelines.
r888800009 · Aug 3, 2024 · 1d7e82d · 1d7e82d
2 parents 39bbbd1 + bb6c60f
commit 1d7e82d
Show file tree

Hide file tree

Showing 10 changed files with 2 additions and 190 deletions.
diff --git a/res/shaders/ada.frag b/res/shaders/ada.frag
diff --git a/res/shaders/ada.vert b/res/shaders/ada.vert
diff --git a/source/app.d b/source/app.d
@@ -98,13 +98,6 @@ int main(string[] args)
             )
         );
 
-        version(InDemo) incModalAdd(
-            new Nagscreen(
-                _("Thank you!"), 
-                _("Thank you for downloading nijigenerate!\nSoftware is expensive to create and the same goes for nijigenerate.\nKindly consider chipping in to fund the development!\n\nTo remove this nagscreen, [buy a copy today!](https://github.com/nijigenerate)"),
-                10
-            )
-        );
         // Update loop
         while(!incIsCloseRequested()) {
             incUpdate();

diff --git a/source/nijigenerate/config.d b/source/nijigenerate/config.d
@@ -43,11 +43,6 @@ enum INC_FEATURE_REQ_URI = "https://github.com/nijigenerate/nijigenerate/issues/
 */
 enum INC_INFO_WEBSITE_URI = "https://github.com/nijigenerate/";
 
-/**
-    URI to buy a copy, unused for non-official builds
-*/
-enum INC_INFO_BUY_URL = "https://lunafoxgirlvt.itch.io/nijigenerate";
-
 /**
     URI to documentation provided for this software, by default it'll direct to the nijilive Documentation
 
@@ -61,7 +56,7 @@ enum INC_INFO_DOCS_URI = "https://docs.github.com/nijigenerate/";
 
     Set to "" to disable the link.
 */
-enum INC_INFO_DISCORD_URI = "https://discord.com/invite/abnxwN6r9v";
+enum INC_INFO_DISCORD_URI = "";
 
 /**
     Whether to show donation links.

diff --git a/source/nijigenerate/core/egg.d b/source/nijigenerate/core/egg.d
diff --git a/source/nijigenerate/core/package.d b/source/nijigenerate/core/package.d
@@ -7,7 +7,6 @@
 module nijigenerate.core;
 import nijigenerate.core.dpi;
 import nijigenerate.core.input;
-import nijigenerate.core.egg;
 import nijigenerate.panels;
 import nijigenerate.windows;
 import nijigenerate.utils.link;
@@ -328,7 +327,6 @@ void incOpenWindow() {
     // Setup nijilive
     inInit(() { return igGetTime(); });
 
-    version(InBranding) incInitAda();
     incCreateContext();
 
     ShallowTexture tex;
@@ -812,12 +810,6 @@ void incEndLoop() {
         SDL_GL_MakeCurrent(currentWindow, currentCtx);
     }
 
-
-    version(InBranding) {
-        import nijigenerate.core.egg : incAdaUpdate;
-        incAdaUpdate();
-    }
-
     SDL_GL_SwapWindow(window);
 }
 

diff --git a/source/nijigenerate/utils/link.d b/source/nijigenerate/utils/link.d
@@ -11,11 +11,5 @@ import std.process;
     Opens a link with the user's preferred webbrowser
 */
 void incOpenLink(string link) {
-    version(Windows) {
-        browse(link);
-    } else version(OSX) {
-        browse(link);
-    } else version(Posix) {
-        browse(link);
-    }
+    browse(link);
 }
diff --git a/source/nijigenerate/widgets/mainmenu.d b/source/nijigenerate/widgets/mainmenu.d
@@ -101,10 +101,6 @@ void incMainMenu() {
                     ImVec4(0, 0, 0, 0)
                 );
 
-                import nijigenerate.core.egg : incAdaTickOne;
-                if (igIsItemClicked(ImGuiMouseButton.Left)) {
-                    incAdaTickOne();
-                }
                 igSeparator();
             }
 

diff --git a/source/nijigenerate/widgets/package.d b/source/nijigenerate/widgets/package.d
@@ -14,7 +14,6 @@ public import nijigenerate.widgets.toolbar;
 public import nijigenerate.widgets.mainmenu;
 public import nijigenerate.widgets.tooltip;
 public import nijigenerate.widgets.statusbar;
-public import nijigenerate.widgets.secrets;
 public import nijigenerate.widgets.dummy;
 public import nijigenerate.widgets.drag;
 public import nijigenerate.widgets.lock;

diff --git a/source/nijigenerate/widgets/secrets.d b/source/nijigenerate/widgets/secrets.d