From df9605fbfda3e2297d1761829efd14dc5ccffd59 Mon Sep 17 00:00:00 2001 From: LunaTheFoxgirl Date: Fri, 2 Aug 2024 08:22:50 +0200 Subject: [PATCH 1/6] Remove demo modal (nijigenerate is free) --- source/app.d | 7 ------- 1 file changed, 7 deletions(-) diff --git a/source/app.d b/source/app.d index 4406da4ea..6c72c0f37 100644 --- 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(); From c98b8bf27ff0f624d8309d48259fa2ba4713d8a7 Mon Sep 17 00:00:00 2001 From: LunaTheFoxgirl Date: Fri, 2 Aug 2024 08:23:22 +0200 Subject: [PATCH 2/6] Clean up incOpenLink impl --- source/nijigenerate/utils/link.d | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/source/nijigenerate/utils/link.d b/source/nijigenerate/utils/link.d index 32e592145..1603f9e26 100644 --- 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); } From 922d208205f2cd1a5960d9bebe917bcc192030ea Mon Sep 17 00:00:00 2001 From: LunaTheFoxgirl Date: Fri, 2 Aug 2024 08:24:48 +0200 Subject: [PATCH 3/6] Support is not provided by Inochi2D. --- source/nijigenerate/config.d | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/source/nijigenerate/config.d b/source/nijigenerate/config.d index 97f381c03..eb812f4a2 100644 --- 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. From 068aa099de4535bfdb9592dcd90cf0657ce8e551 Mon Sep 17 00:00:00 2001 From: LunaTheFoxgirl Date: Fri, 2 Aug 2024 08:27:10 +0200 Subject: [PATCH 4/6] Remove Inochi2D easter eggs. --- res/shaders/ada.frag | 17 ----- res/shaders/ada.vert | 20 ----- source/nijigenerate/core/egg.d | 104 -------------------------- source/nijigenerate/widgets/package.d | 1 - source/nijigenerate/widgets/secrets.d | 16 ---- 5 files changed, 158 deletions(-) delete mode 100644 res/shaders/ada.frag delete mode 100644 res/shaders/ada.vert delete mode 100644 source/nijigenerate/core/egg.d delete mode 100644 source/nijigenerate/widgets/secrets.d diff --git a/res/shaders/ada.frag b/res/shaders/ada.frag deleted file mode 100644 index d17a73eeb..000000000 --- a/res/shaders/ada.frag +++ /dev/null @@ -1,17 +0,0 @@ -/* - Copyright © 2020-2023, nijigenerate Project - Distributed under the 2-Clause BSD License, see LICENSE file. - - Authors: Luna Nielsen -*/ -#version 330 -in vec2 texUVs; - -layout(location = 0) out vec4 outAlbedo; -uniform sampler2D albedo; - -void main() { - - // Throw ada out there - outAlbedo = texture(albedo, texUVs); -} \ No newline at end of file diff --git a/res/shaders/ada.vert b/res/shaders/ada.vert deleted file mode 100644 index c9e71d90a..000000000 --- a/res/shaders/ada.vert +++ /dev/null @@ -1,20 +0,0 @@ -/* - Copyright © 2020-2023, nijigenerate Project - Distributed under the 2-Clause BSD License, see LICENSE file. - - Authors: Luna Nielsen -*/ -#version 330 -uniform mat4 mvp; -uniform vec2 offset; - -layout(location = 0) in vec2 verts; -layout(location = 1) in vec2 uvs; -layout(location = 2) in vec2 deform; - -out vec2 texUVs; - -void main() { - gl_Position = mvp * vec4(verts.x+deform.x, verts.y+deform.y, 0, 1); - texUVs = uvs; -} \ No newline at end of file diff --git a/source/nijigenerate/core/egg.d b/source/nijigenerate/core/egg.d deleted file mode 100644 index 8046737b4..000000000 --- a/source/nijigenerate/core/egg.d +++ /dev/null @@ -1,104 +0,0 @@ -/* - Copyright © 2022, nijigenerate Project - Distributed under the 2-Clause BSD License, see LICENSE file. - - Authors: Luna Nielsen -*/ -module nijigenerate.core.egg; -import nijigenerate.core; -import nijilive; -import bindbc.sdl; -import bindbc.opengl; -import std.stdio; -import std.random; - -version(InBranding) { - private { - int logoClickCounter; - vec2 adaOffset; - vec2 adaVelocity; - enum ADA_SIZE = 396; - enum CLICK_THRESH = 25; - - enum JUMP_SPEED_X = 500; - enum JUMP_SPEED_Y = 700; - bool lhs; - Camera cam; - - Shader adaShader; - } - - void incAdaTickOne() { - logoClickCounter++; - if (logoClickCounter == CLICK_THRESH) { - lhs = !lhs; - - float uiScale = incGetUIScale(); - int w, h; - SDL_GetWindowSize(incGetWindowPtr(), &w, &h); - - float adaHalf = (ADA_SIZE*uiScale)/2; - float hws = (w/2)/uiScale; - - // Alternate jumping from left and right - float spawnX = lhs ? uniform(-(hws+adaHalf), -adaHalf) : uniform(adaHalf, hws-adaHalf); - float dirX = (lhs ? uniform(-JUMP_SPEED_X, -100) : uniform(100, JUMP_SPEED_X))*uiScale; - adaVelocity = vec2(dirX, -JUMP_SPEED_Y*uiScale); - adaOffset = vec2(spawnX, 0); - } - } - - // UwU - void incAdaUpdate() { - if (logoClickCounter >= CLICK_THRESH) { - float fbScale = igGetIO().DisplayFramebufferScale.x; - float uiScale = incGetUIScale(); - - cam.scale = vec2(1*fbScale, 1*fbScale); - - int w, h; - int ww, wh; - inGetViewport(ww, wh); - SDL_GetWindowSize(incGetWindowPtr(), &w, &h); - - glDisable(GL_DEPTH_TEST); - glDisable(GL_CULL_FACE); - glEnable(GL_BLEND); - glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA); - - float halfWidth = w/2; - float halfHeight = h/2; - - adaOffset -= adaVelocity*deltaTime(); - adaVelocity.y += 500.0*deltaTime(); - - inSetViewport(cast(int)(w*fbScale), cast(int)(h*fbScale)); - inDrawTextureAtRect( - incGetAda(), - rect(adaOffset.x, halfHeight-adaOffset.y, ADA_SIZE*uiScale, ADA_SIZE*uiScale), - rect(0, 0, 1, 1), - 1, - vec3(1, 1, 1), - vec3(0, 0, 0), - adaShader, - cam - ); - - inSetViewport(ww, wh); - - // Animation is over - if (adaOffset.y < -((ADA_SIZE+32)*uiScale)) { - logoClickCounter = 0; - } - } - } - - void incInitAda() { - adaShader = new Shader(import("shaders/ada.vert"), import("shaders/ada.frag")); - - cam = new Camera(); - cam.position = vec2(0, 0); - cam.scale = vec2(1, 1); - cam.rotation = 0; - } -} \ No newline at end of file diff --git a/source/nijigenerate/widgets/package.d b/source/nijigenerate/widgets/package.d index 7ec591ed0..713d7e8bc 100644 --- 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 deleted file mode 100644 index b7788291c..000000000 --- a/source/nijigenerate/widgets/secrets.d +++ /dev/null @@ -1,16 +0,0 @@ -/* - Copyright © 2020-2023, nijigenerate Project - Distributed under the 2-Clause BSD License, see LICENSE file. - - Authors: Luna Nielsen -*/ -module nijigenerate.widgets.secrets; - -bool isTransMonthOfVisibility; -static this() { - import std.datetime : Date, SysTime, Clock, Month; - auto time = Clock.currTime(); - - isTransMonthOfVisibility = time.month == Month.nov; - -} \ No newline at end of file From 3da8f9740137e4a7da76d17d622329cf97a5ace1 Mon Sep 17 00:00:00 2001 From: LunaTheFoxgirl Date: Fri, 2 Aug 2024 17:39:06 +0200 Subject: [PATCH 5/6] Add things I forgot to save --- source/nijigenerate/core/package.d | 7 ------- source/nijigenerate/widgets/mainmenu.d | 4 ---- 2 files changed, 11 deletions(-) diff --git a/source/nijigenerate/core/package.d b/source/nijigenerate/core/package.d index e2a8144a5..30beb47c2 100644 --- 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; @@ -812,12 +811,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/widgets/mainmenu.d b/source/nijigenerate/widgets/mainmenu.d index b9c3a2baa..2cf6707b5 100644 --- 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(); } From bb6c60f7c06f9e8106c21a1912a2e2aff8b0477c Mon Sep 17 00:00:00 2001 From: LunaTheFoxgirl Date: Sat, 3 Aug 2024 09:44:11 +0200 Subject: [PATCH 6/6] Remove init function call --- source/nijigenerate/core/package.d | 1 - 1 file changed, 1 deletion(-) diff --git a/source/nijigenerate/core/package.d b/source/nijigenerate/core/package.d index 30beb47c2..987fe05e5 100644 --- a/source/nijigenerate/core/package.d +++ b/source/nijigenerate/core/package.d @@ -327,7 +327,6 @@ void incOpenWindow() { // Setup nijilive inInit(() { return igGetTime(); }); - version(InBranding) incInitAda(); incCreateContext(); ShallowTexture tex;