screenswitch anim

Author: counter185

freesprite/UILayerButton.cpp

@@ -132,6 +132,7 @@ void LayerActiveButton::render(XY at)
         previewRect.x = at.x - previewRect.w;
         previewRect.y = at.y;
 
+        //unclip to escape scrollpanel bounds
         g_pushClip({ 0,0,g_windowW, g_windowH });
         SDL_SetRenderDrawColor(g_rd, 0, 0, 0, 0x80);
         SDL_RenderFillRect(g_rd, &previewRect);

freesprite/globals.h

@@ -358,7 +358,7 @@ void g_addNotificationFromThread(Notification a);
 void g_addScreen(BaseScreen* a, bool switchTo = true);
 void g_addScreenToWindow(VSPWindow* wd, BaseScreen* a, bool switchTo = true);
 void g_closeScreen(BaseScreen* screen);
-void g_switchScreen(int index);
+void g_switchScreen(int index, int vfxExt = 0);
 
 void g_addPopup(BasePopup* a);
 void g_closePopup(BasePopup* a, bool dispose = true);

freesprite/multiwindow.cpp

@@ -336,12 +336,12 @@ bool VSPWindow::closeScreen(BaseScreen* screen) {
     }
 }
 
-void VSPWindow::switchScreen(int index) {
+void VSPWindow::switchScreen(int index, int vfxExt) {
     if (index >= 0 && index < screenStack.size()) {
         if (index != currentScreen) {
             currentScreen = index;
             screenStack[currentScreen]->onReturnToScreen();
-            g_newVFX(VFX_SCREENSWITCH, 800);
+            g_newVFX(VFX_SCREENSWITCH, 800, vfxExt);
         }
         overlayWidgets.forceUnfocus();
     }
@@ -351,10 +351,10 @@ void VSPWindow::switchScreenLeft() {
     if (popupStack.empty()) {
         if (currentScreen != 0) {
             if (g_ctrlModifier) {
-                g_switchScreen(0);
+                g_switchScreen(0, 1);
             }
             else {
-                g_switchScreen(currentScreen - 1);
+                g_switchScreen(currentScreen - 1, 1);
             }
         }
     }
@@ -364,10 +364,10 @@ void VSPWindow::switchScreenRight() {
     if (popupStack.empty()) {
         if (currentScreen < screenStack.size() - 1) {
             if (g_ctrlModifier) {
-                g_switchScreen(screenStack.size() - 1);
+                g_switchScreen(screenStack.size() - 1, 2);
             }
             else {
-                g_switchScreen(currentScreen + 1);
+                g_switchScreen(currentScreen + 1, 2);
             }
         }
     }

freesprite/multiwindow.h

@@ -124,7 +124,7 @@ class VSPWindow {
 
     bool closeScreen(BaseScreen* screen);
 
-    void switchScreen(int index);
+    void switchScreen(int index, int vfxExt = 0);
 
     void switchScreenLeft();
     void switchScreenRight();

freesprite/vfx.cpp

@@ -2,6 +2,8 @@
 #include "vfx.h"
 #include "Timer64.h"
 #include "main.h"
+#include "multiwindow.h"
+#include "BaseScreen.h"
 
 class VFX {
 private:
@@ -58,6 +60,22 @@ class VFX {
                 {
                     double animTimer = interpolation(timer.percentElapsedTime(duration));
                     double reverseAnimTimer = 1.0 - animTimer;
+                    if (extData1 != 0) {
+                        int prevScreenIndex = g_currentWindow->currentScreen + (extData1 == 1 ? 1 : -1);
+                        if (g_currentWindow->screenStack.size() > prevScreenIndex) {
+                            double animTimer2 = interpolation(timer.percentElapsedTime(duration/3));
+                            int w = g_windowW * (1.0-animTimer2);
+                            if (w > 0) {
+                                int divLinePos = extData1 == 1 ? g_windowW - w : w;
+                                SDL_Rect clipRect = { extData1 == 1 ? divLinePos : 0, 0, w, g_windowH };
+                                SDL_SetRenderDrawColor(g_rd, 255, 255, 255, 0x60);
+                                drawLine({ divLinePos, 0 }, { divLinePos, g_windowH });
+                                g_pushClip(clipRect);
+                                g_currentWindow->screenStack[prevScreenIndex]->render();
+                                g_popClip();
+                            }
+                        }
+                    }
                     SDL_Rect rect = { 0,0,g_windowW, g_windowH };
                     XY windowOffset = { g_windowW / 16 , g_windowH / 16 };
                     rect = offsetRect(rect, windowOffset.x * -reverseAnimTimer, windowOffset.y * -reverseAnimTimer);