changeset 2:496b9ab9238c

Moar.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 21 May 2015 23:30:51 +0300
parents 7f6f64ca58f6
children 37b33851cfbb
files demo.c
diffstat 1 files changed, 2 insertions(+), 325 deletions(-) [+]
line wrap: on
line diff
--- a/demo.c	Thu May 21 22:54:08 2015 +0300
+++ b/demo.c	Thu May 21 23:30:51 2015 +0300
@@ -12,7 +12,7 @@
 int demoPreInit(DMEngineData *engine)
 {
     dmInitProg("bussi",
-        "Bussi by AnCiat ProDz",
+        "Bussi by AnCiat ProDucTionz",
         "0", "ENGINE INITTIALISSSIZING!!!!!", NULL);
 
     engine->optPackFilename  = "bussi.dat";
@@ -277,8 +277,6 @@
         dmConvertFFTtoPowerAndSum(&fft, fftData, fftAmp, 1.0, &fftPow, 0.00004f);
     }
 
-
-#if 1
     // Demokoodi
     if (t < 5)
     {
@@ -289,7 +287,7 @@
         static BOOL nollattu = FALSE;
         if (!nollattu)
         {
-            engineGetResImage(engine, tausta, "tausta.jpg");
+            engineGetResImage(engine, tausta, "tausta_pv.png");
             cblit = dmGetScaledBlitFunc(tausta->format, engine->screen->format, DMD_NONE);
 
             dmLerpInit(&fadeLerp, 0, 255, 5000);
@@ -302,327 +300,6 @@
             0,
             0,
 
-            dmQX(engine, tausta, 1.0f),
-            dmQX(engine, tausta, 1.0f),
-
-            engine->screen,
-            dmLerpSCurveClamp(&fadeLerp, dt + 150500 * fftPow));
-    }
-#endif
-#if 0
-    else
-    if (t < 25)
-    {
-        static BOOL nollattu = FALSE;
-        static SDL_Surface *tausta = NULL;
-        if (!nollattu)
-        {
-            engineGetResImage(engine, tausta, "tausta.jpg");
-        }
-
-        cblit(tausta,
-            0,
-            0,
-
-            dmQX(engine, tausta, 1.0f),
-            dmQX(engine, tausta, 1.0f),
-
-            engine->screen);
-    }
-    
-    if (t <= 7)
-    {
-        int dt = engineGetTime(engine, 2);
-        static DMLerpContext fadeLerp;
-        static SDL_Surface *logo1 = NULL, *logo2 = NULL;
-        static BOOL nollattu = FALSE;
-        if (!nollattu)
-        {
-            engineGetResImage(engine, logo1, "iso.png");
-            engineGetResImage(engine, logo2, "forevisar.png");
-
-            dmLerpInit(&fadeLerp, 0, 255, 2500);
-            nollattu = TRUE;
-        }
-    
-        int fade;
-        if (dt < 2500)
-        {
-            fade = dmLerpSCurveClamp(&fadeLerp, dt + fftPow * 1000);
-        }
-        else
-        if (dt > 4500)
-        {
-            fade = 255 - dmLerpSCurveClamp(&fadeLerp, dt - 4500 + fftPow * 1000);
-        }
-        else
-        {
-            fade = 255;
-        }
-        
-        float d = fftPow * 0.1f;
-
-        dmScaledBlitSurface32to32TransparentGA(logo1,
-            dmCX(engine, 0.1f),
-            dmCY(engine, 0.22f),
-
-            dmQX(engine, logo1, 1.0f),
-            dmQY(engine, logo1, 1.0f),
-
-            engine->screen,
-            fade);
-
-        dmScaledBlitSurface32to32TransparentGA(logo2,
-            dmCX(engine, 0.2f - d),
-            dmCY(engine, 0.72f - d),
-
-            dmQX(engine, logo2, 1.0f + d * 2.0f),
-            dmQY(engine, logo2, 1.0f + d * 2.0f),
-
-            engine->screen,
-            fade);
-    }
-    else
-    if (t <= 15)
-    {
-        int dt = engineGetTime(engine, 7);
-        static DMLerpContext fadeLerp;
-        static SDL_Surface *logo1 = NULL, *logo2 = NULL;
-        static BOOL nollattu = FALSE;
-        if (!nollattu)
-        {
-            engineGetResImage(engine, logo1, "hitler_on_kiva.png");
-            engineGetResImage(engine, logo2, "hitler.png");
-
-            dmLerpInit(&fadeLerp, 0, 255, 2500);
-            nollattu = TRUE;
-        }
-    
-        int fade;
-        if (dt < 2500)
-        {
-            fade = dmLerpSCurveClamp(&fadeLerp, dt + fftPow * 1000);
-        }
-        else
-        if (dt > 4500)
-        {
-            fade = 255 - dmLerpSCurveClamp(&fadeLerp, dt - 4500 + fftPow * 1000);
-        }
-        else
-        {
-            fade = 255;
-        }
-        
-        dmScaledBlitSurface32to32TransparentGA(logo1,
-            dmCX(engine, 0.1f),
-            dmCY(engine, 0.22f),
-
-            dmQX(engine, logo1, 1.0f),
-            dmQY(engine, logo1, 1.0f),
-
-            engine->screen,
-            fade);
-
-        float q = fftPow * 0.2;
-        dmScaledBlitSurface32to32TransparentGA(logo2,
-            dmCX(engine, 0.15f),
-            dmCY(engine, 0.47f - q),
-
-            dmQX(engine, logo2, 1.0f + q),
-            dmQY(engine, logo2, 1.0f + q),
-
-            engine->screen,
-            fade);
-    }
-    
-    if (t <= 15)
-    {
-        int dt = engineGetTime(engine, 0);
-        static DMLerpContext posLerp, posLerp2;
-        static SDL_Surface *mainos = NULL;
-        static BOOL nollattu = FALSE;
-        if (!nollattu)
-        {
-            engineGetResImage(engine, mainos, "radio.png");
-
-            dmLerpInit(&posLerp, 1, -1, 15000);
-            dmLerpInit(&posLerp2, 0.3, 0.7, 15000);
-            nollattu = TRUE;
-        }
-
-        dmScaledBlitSurface32to32TransparentGA(mainos,
-            dmCX(engine, dmLerpSCurveClamp(&posLerp2, dt)),
-            dmCY(engine, dmLerpSCurveClamp(&posLerp, dt)),
-
-            dmQX(engine, mainos, 1.0f),
-            dmQY(engine, mainos, 1.0f),
-
-            engine->screen,
-            50);
-    }
-    else
-    if (t <= 25)
-    {
-        int dt = engineGetTime(engine, 15);
-        static DMLerpContext posLerp, posLerp2;
-        static DMScaledBlitFunc qblit = NULL;
-        static SDL_Surface *mainos = NULL, *mainos2 = NULL, *hitler = NULL, *sydan = NULL;
-        static BOOL nollattu = FALSE;
-        if (!nollattu)
-        {
-            engineGetResImage(engine, mainos, "lasi.jpg");
-            engineGetResImage(engine, mainos2, "nigrolin.jpg");
-            engineGetResImage(engine, hitler, "hitler2.png");
-            engineGetResImage(engine, sydan, "sydan.png");
-
-            qblit = dmGetScaledBlitFunc(hitler->format, engine->screen->format, DMD_TRANSPARENT);
-
-            dmLerpInit(&posLerp, 1, -1, 20000);
-            dmLerpInit(&posLerp2, -0.5, -0.2, 20000);
-
-            nollattu = TRUE;
-        }
-
-        dmScaledBlitSurface32to32TransparentGA(mainos,
-            dmCX(engine, dmLerpSCurveClamp(&posLerp2, dt)),
-            dmCY(engine, dmLerpSCurveClamp(&posLerp, dt + fftPow * 250)),
-
-            dmQX(engine, mainos, 1.0f),
-            dmQY(engine, mainos, 1.0f),
-
-            engine->screen,
-            50);
-
-        dmScaledBlitSurface32to32TransparentGA(mainos2,
-            dmCX(engine, dmLerpSCurveClamp(&posLerp, dt)),
-            dmCY(engine, dmLerpSCurveClamp(&posLerp2, dt + fftPow * 250)),
-
-            dmQX(engine, mainos2, 1.0f),
-            dmQY(engine, mainos2, 1.0f),
-
-            engine->screen,
-            50);
-
-        float d = fftPow * 0.1f;
-
-        qblit(hitler,
-            dmCX(engine, 0.4 - d),
-            dmCY(engine, 0.3 - d),
-
-            dmQX(engine, hitler, 1.0f + d * 2.0f),
-            dmQY(engine, hitler, 1.0f + d * 2.0f),
-
-            engine->screen);
-
-
-
-        if (t > 17)
-        {
-            static BOOL xnollattu = FALSE;
-
-            if (t > 19)
-            {
-            float z = sin(t * 2.0f + fftPow) * 0.1f;
-            qblit(sydan,
-                dmCX(engine, 0.7) + dmQX(engine, sydan, 0.5f - z),
-                dmCY(engine, 0.55) + dmQX(engine, sydan, 0.5f - z),
-
-                dmQX(engine, sydan, 1.0f + z * 2.0f),
-                dmQY(engine, sydan, 1.0f + z * 2.0f),
-
-                engine->screen);
-            }
-
-            hitlerText(engine, engineGetTime(engine, 17), fftPow, textItems, ntextItems, &xnollattu);
-        }
-    }
-    else
-    if (t <= 60)
-    {
-        int dt = engineGetTime(engine, 25);
-        static SDL_Surface *tekstur, *poni1, *poni2;
-        static BOOL nollattu = FALSE;
-        static DMScaledBlitFunc qblit = NULL;
-        if (!nollattu)
-        {
-            engineGetResImage(engine, tekstur, "disco.jpg");
-            engineGetResImage(engine, poni1, "poni1.png");
-            engineGetResImage(engine, poni2, "poni2.png");
-
-            qblit = dmGetScaledBlitFunc(poni1->format, engine->screen->format, DMD_TRANSPARENT);
-
-            nollattu = TRUE;
-        }
-
-        float m = t*2.0f;
-        float q = sin(m) * 0.3f,
-              q2 = sin(m + 0.2) * 0.4f,
-              z = sin(m) * 0.3f + 2.0f,
-              z2 = sin(m + 0.1f) * 0.3f + 2.0f;
-        
-        dmScaledBlitSurface32to32TransparentGA(tekstur,
-            dmCX(engine, sin(q) * 0.1f - 0.2f),
-            dmCY(engine, cos(q) * 0.1f - 0.2f),
-
-            dmQX(engine, tekstur, z),
-            dmQY(engine, tekstur, z),
-
-            engine->screen,
-            130);
-
-        dmScaledBlitSurface32to32TransparentGA(tekstur,
-            dmCX(engine, sin(q2) * 0.1f - 0.2f),
-            dmCY(engine, cos(q2) * 0.1f - 0.2f),
-
-            dmQX(engine, tekstur, z2),
-            dmQY(engine, tekstur, z2),
-
-            engine->screen,
-            130);
-
-
-        qblit(poni1,
-            dmCX(engine, 0.2f),
-            dmCY(engine, 0.07f),
-
-            dmQX(engine, poni1, 1.0f),
-            dmQY(engine, poni1, 1.0f),
-
-            engine->screen);
-
-
-        dmScaledBlitSurface32to32TransparentGA(poni2,
-            dmCX(engine, 0.2f),
-            dmCY(engine, 0.07f),
-
-            dmQX(engine, poni2, 1.0f),
-            dmQY(engine, poni2, 1.0f),
-
-            engine->screen,
-            50 + fftPow * 400);
-          
-        dmRadialBlur(engine->screen,
-            dmCX(engine, 0.5f + sin(m) * 0.1f),
-            dmCY(engine, 0.5f + cos(m) * 0.1f),
-            0.035f);
-
-        if (t >= 30 && t <= 37)
-        {
-            static BOOL xnollattu = FALSE;
-            hitlerText(engine, engineGetTime(engine, 30), fftPow + 0.2, textItems2, ntextItems2, &xnollattu);
-        }
-        else
-        if (t >= 38 && t <= 47)
-        {
-            static BOOL xnollattu = FALSE;
-            hitlerText(engine, engineGetTime(engine, 38), fftPow + 0.2, textItems3, ntextItems3, &xnollattu);
-        }
-        else
-        if (t > 50)
-            return 1;
-    } 
-
-#endif
 
     return DMERR_OK;
 }