forks/3x666-SDL: 3x666.c comparison

comparison 3x666.c @ 9:84d7bc7dfaeb

More cleanup work.

author	Matti Hamalainen <ccr@tnsp.org>
date	Fri, 15 Mar 2013 06:08:10 +0200
parents	bbc901af24fb
children	fcae85b39931

comparison

equal deleted inserted replaced

-:bbc901af24fb
+:84d7bc7dfaeb
+#include <SDL.h>
 #include <math.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
 #include "config.h"
 #include "3xfont.h"
 /** typedefs **/
 typedef struct
 {
-signed int x, y, z;
+int x, y, z;
 } vec3d;
 int TIKLGT;
-char *ruutu;
+SDL_Color pal[256];
+Uint8 *ruutu;
 int *mxbuf;
 int *ballz;
 /**************** tEXT dRAWiNG rOUTiNES **********
 bitmaps are for lamers :) let's use a little 12-segment calculator font...
 h += y;
 y = 0;
 }
 if (w > 0 && h > 0)
 {
-char *b = ruutu + y * BUFW + x;
+Uint8 *b = ruutu + y * BUFW + x;
 for (; h; h--)
 {
 memset(b, 122, w);
 b += BUFW;
 }
 y += yunit * 2;
 c >>= 3;
 }
 }
-void drawtxtscr(char *z)
+void drawtxtscr(char *str)
 {
 int x = BUFW >> 4, y = BUFH >> 3;
-while (*z)
+while (*str)
 {
-if (*z >= 32)
+if (*str >= 32)
 {
-drawchar(x, y, phont[*z - 32], BUFW / 50, BUFW / 80);
+drawchar(x, y, phont[*str - 32], BUFW / 50, BUFW / 80);
 x += BUFW / 10;
 }
 else
 {
 x = BUFW >> 4;
 y += BUFW / 10;
 }
-z++;
+str++;
 }
 }
-void flashtxt(char *txt)
+void flashtxt(char *str)
 {
-int x = (BUFW >> 1) - (strlen(txt) + 1) * 3 * BUFW / 80;
+int x = (BUFW >> 1) - (strlen(str) + 1) * 3 * BUFW / 80;
-while (*txt)
+while (*str)
 {
-drawchar(x, BUFH >> 1, phont[*txt++ - 32], BUFW / 50, BUFW / 80);
+drawchar(x, BUFH >> 1, phont[*str++ - 32], BUFW / 50, BUFW / 80);
 x += BUFW / 10;
 }
 }
 /*************************** DA PHONGBALL HEAVEN **************
 "twisty" but who cares, it just looks damn cool ;)
 ***/
 #if (BUFH < BUFW)
-#    define maxR (BUFH>>1)
+#    define maxR (BUFH >> 1)
 #else
-#    define maxR (BUFW>>1)
+#    define maxR (BUFW >> 1)
 #endif
 struct
 {
 int *tab;
 balltab[49].R = balltab[48].R = balltab[47].R;
 balltab[49].tab = balltab[48].tab = balltab[47].tab;
 }
-/**
-	The i386 innerloop compiled by gcc sucked a bit so here's another
+void drawball_inloop(Uint8 *d, int dotxyz, int ddot, int dddot, int x)
-	one. Hope it runs faster :) I tried to optimize it for the 386,
-	maybe 486 (not pentium kos it suxx)
-**/
-inline void drawball_inloop(char *d, int dotxyz, int ddot, int dddot, int x)
 {
 for (; x; x--)
 {
 dotxyz += ddot;
 ddot += dddot;
 *d++ = dotxyz >> 16;
 }
 }
-void drawball(char *d, vec3d * l, int relR)
+void drawball(Uint8 *d, vec3d * l, int relR)
 {
 int R = balltab[relR].R, *s = balltab[relR].tab;
 signed int doty = (-(R - 1) * l->y);
 signed int y = R * 2 - 2;
 d += (BUFW >> 1) - R + ((BUFH >> 1) - R) * BUFW;
 if (y)
+{
 for (; y; y--)
 {
 int halfw = *s++;
 if (halfw)
 drawball_inloop(d + R - halfw,
 (l->x + l->z) << 8,
 0 - ((l->z << 8) / halfw), halfw << 1);
 d += BUFW;
 doty += l->y;
 }
+}
 }
 /* some extra for freaks: a plasma made with the phongball innerloop :)
 looks ugly.
 }
 */
 /************************ oTHA FX ***************/
-void rotochess(char *d, int du, int dv, int iu, int iv)
+void rotochess(Uint8 *d, int du, int dv, int iu, int iv)
 {
 int hu = iu - (dv * (BUFH >> 1)) - (du * (BUFW >> 1)),
 hv = iv + (du * (BUFH >> 1)) - (dv * (BUFW >> 1));
 int y;
 }
 }
 /***************************************************************/
-rgb pal[256], pal2[256];
 void setpal()
 {
 int i, a = 3, b = 0;
 for (i = 255; i; i--)
 {
-rgb *d = &pal[(i + 128) & 255];
+SDL_Color *d = &pal[(i + 128) & 255];
-d->r = (abs(i - 140) >> a) & 255;
+d->r =  (abs(i - 140) >> a) & 255;
 d->g = ((abs(i - 128) >> b) & 255) ^ 1;
-d->b = (abs(i - 96) >> b) & 255;
+d->b =  (abs(i - 96) >> b) & 255;
 if (i == 128)
 {
 a = 0;
 b = 1;
 }
 }
 oxl_setpalette(pal);
 }
 void unitvec(vec3d * v, float a, float b, float c, float m)
 {
 float cam = cos(a) * m, sam = sin(a) * m, sbcam = sin(b) * cam;
 /************************* MUSiC cODE **************************/
 /* This table was ripped (and reduced and rudely integerized) from the
 Maube tracker by K .. keep on the good work man! ;) */
-const int noterate[3 * 12] =
+const Sint16 noterate[3 * 12] =
 {
 1000, 1059, 1122, 1189, 1259, 1334,
 1414, 1498, 1587, 1681, 1781, 1887,
 2000, 2118, 2244, 2378, 2519, 2669,
 22, 17, 17, 22
 };
 signed int *drum0, *drum1;
 /* sampling sucks! */
 void audio_precalcs()
 {
 int drumlgt = TIKLGT * ROWTIX * 4;
 int *d = drum0 = malloc(drumlgt * sizeof(int)),
 *e++ = (vol * sin(a + ((float) oo) / 60000));
 a += da;
 da -= dda;
 vol -= dvol;
-}}
+}
+}
 /* mixes the next row of music into b */
 int *audio_mix(void)
 {
 note = basstrak[(rowno >> 1) & 31];
 if (!note)
 note = basstrak[((rowno >> 1) & 31) - 1];
-else if (rowno & 1)
+else
+if (rowno & 1)
 note = 0;
 if ((rowno & 3) == 3)
 note = 0;
 if (note)
 {
 int ps = 16384, dps;
 note += delta;
 dps = ((noterate[note] << 10) / AUFREQ);
 *d++ = ps;
 ps = (ps + dps) & 32767;
 }
 }
 else
+{
 for (i = rowlgt; i; i--)
 *d++ = 16384;
+}
 /* MELODY (sawtooth as well :) */
 if (!(silend && ((rowno & 63) > 47)))
 {
 *d++ += ps;
 ps = (ps + dps) & 32767;
 }
 }
 }
 /* DRUMS (rave on!!!) */
 {
 int *s = drum1;
 d = mxbuf + 1;
 if (rowno & 4)
 s = drum0;
 /* no switch+case? just check out how gcc handles them!
 it's 1024+ bytes for every phukken switch statement!
 in this case we can prefer size to speed, can't we? */
-if (!(rowno & 63))
+if ((rowno & 63) == 0)
 {
 int r = rowno >> 6;
 if (r == 2)
 delta = 0;
 if (r == 4)
 #define TXTSCR    0x0400
 #define ENDSCR    0x0800
 #define DEMOEND   0x1000
 const short dezign[] = {
-0, BLACKBG | OCSALOGO | SCROLL0,
+0   , BLACKBG | OCSALOGO | SCROLL0,
-256, FLASHBG | BALLIE | BALLJUMPS | COUNTAH,
+256 , FLASHBG | BALLIE | BALLJUMPS | COUNTAH,
-384, BLACKBG | BALLIE | BALLJUMPS | COUNTAH | OCSALOGO,
+384 , BLACKBG | BALLIE | BALLJUMPS | COUNTAH | OCSALOGO,
-400, BLACKBG | BALLIE | COUNTAH | OCSALOGO,
+400 , BLACKBG | BALLIE | COUNTAH | OCSALOGO,
-416, BLACKBG | BALLIE,
+416 , BLACKBG | BALLIE,
-448, BLACKBG | BALLIE | TXTSCR,
+448 , BLACKBG | BALLIE | TXTSCR,
-512, CHESSBG | BALLIE | BALLJUMPS | TXTSCR,
+512 , CHESSBG | BALLIE | BALLJUMPS | TXTSCR,
-576, CHESSBG | BALLIE | BALLJUMPS | TXTSCR,
+576 , CHESSBG | BALLIE | BALLJUMPS | TXTSCR,
-640, CHESSBG | BALLIE | BALLJUMPS | TXTSCR,
+640 , CHESSBG | BALLIE | BALLJUMPS | TXTSCR,
-704, CHESSBG | BALLIE | BALLJUMPS | TXTSCR,
+704 , CHESSBG | BALLIE | BALLJUMPS | TXTSCR,
-768, FLASHBG | FLASHTXT,
+768 , FLASHBG | FLASHTXT,
-896, FLASHBG | FLASHTXT | TXTSCR,
+896 , FLASHBG | FLASHTXT | TXTSCR,
-962, FLASHBG | FLASHTXT | TXTSCR | BALLIE | BALLJUMPS,
+962 , FLASHBG | FLASHTXT | TXTSCR | BALLIE | BALLJUMPS,
 1024, BLACKBG | BALLIE | ENDSCR,
 1152, CHESSBG | BALLIE | BALLJUMPS | ENDSCR,
 1344, FLASHBG | BALLIE | BALLJUMPS | ENDSCR,
 1536, DEMOEND
 };
 int flagz = 0;
 const short *dez = dezign;
 char *phiword = NULL, *dizainword = NULL;
 int flixtim = 0;
-ruutu = malloc(BUFH * BUFW * sizeof(char));
 preball();
 srand((int) time(NULL));
-oxl_init_audio(ROWTIX);
 TIKLGT = AUFREQ / DEMOHZ;
 mxbuf = malloc(MAXROWLGT * sizeof(int));
 audio_precalcs();
-oxl_init_video();
-oxl_init_timer();
 setpal();
 for (;;)
 {
 drawball(ruutu, &joo, zoom);
 }
 if (flagz & FLASHTXT)
 flashtxt(phiword);
-if (flagz & TXTSCR)
-if ((t / ROWTIX) & 2)
+if ((flagz & TXTSCR) && ((t / ROWTIX) & 2))
 drawtxtscr(dizainword);
 if (flagz & ENDSCR)
 doendscroll(t - 1024 * ROWTIX);
 if (flagz & COUNTAH)
 n /= 10;
 }
 /* blitzz */
-oxl_doframe(ruutu);
+SDL_flip(...);
-oxl_doaudio(audio_mix);
-while (t == oxl_timer())
+SDL_Delay(25);
-{
+}
-usleep(250000 / DEMOHZ);
-}
+SDL_Quit();
 }
-oxl_end();
-}

Mercurial > hg > forks > 3x666-SDL

comparison 3x666.c @ 9:84d7bc7dfaeb