gr-sim: more work on dots

utils/gr-sim/dots/Makefile

@@ -4,7 +4,7 @@ CFLAGS = -O2 -Wall -g
 SDL_LIBS= `sdl-config --libs`
 SDL_INCLUDE= `sdl-config --cflags`
 
-all:	dots dots_dump dots_play dots_minimal
+all:	dots dots_dump dots_play dots_minimal dots_6502
 
 ###
 
@@ -38,6 +38,15 @@ dots_minimal:	dots_minimal.o ../gr-sim.a
 dots_minimal.o:	dots_minimal.c
 	$(CC) $(CFLAGS) $(SDL_INCLUDE) -c dots_minimal.c
 
+###
+
+dots_6502:	dots_6502.o ../gr-sim.a
+	$(CC) -o dots_6502 dots_6502.o ../gr-sim.a $(LFLAGS) $(SDL_LIBS)
+
+dots_6502.o:	dots_6502.c
+	$(CC) $(CFLAGS) $(SDL_INCLUDE) -c dots_6502.c
+
+
 
 ###
 
@@ -52,4 +61,4 @@ vga_emulator.o:	vga_emulator.c vga_emulator.h
 ###
 
 clean:	
-	rm -f *~ *.o dots dots_dump dots_play dots_minimal
+	rm -f *~ *.o dots dots_dump dots_play dots_minimal dots_6502

utils/gr-sim/dots/dots.c

@@ -902,7 +902,7 @@ int main(int argc,char **argv) {
 		}
 #endif
 
-again:
+//again:
 		ch=grsim_input();
 		if (ch==27) {
 			return 0;

utils/gr-sim/dots/dots_6502.c

@@ -0,0 +1,295 @@
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <malloc.h>
+#include <math.h>
+
+#include "../gr-sim.h"
+#include "../tfv_zp.h"
+
+#include "sin1024.h"
+
+#define	MAXDOTS	256
+
+//#define SKIP	2
+
+static short gravitybottom;
+static short gravity=0;
+static short gravityd=16;
+
+static struct {
+	short	x;	// 0
+	short	y;	// 2
+	short	z;	// 4
+	short	yadd;	// 14
+} dot[MAXDOTS];
+
+static short rotsin=0;
+static short rotcos=0;
+
+static void drawdots(void) {
+	int temp32;
+	int transx,transz;
+	unsigned short ball_x,ball_y,shadow_y;
+	unsigned short d,sc,newy;
+	unsigned short ax,bx,cx,dx;
+	short signed_ax;
+
+	for(d=0;d<MAXDOTS;d++) {
+
+		transx=dot[d].x*rotsin;
+		transz=dot[d].z*rotcos;
+		temp32=transz-transx;
+		sc=(temp32>>16)+9000;
+		if (sc==0) sc=1;
+
+		transx=dot[d].x*rotcos;
+		transz=dot[d].z*rotsin;
+		temp32=transx+transz;
+		temp32>>=8;
+
+		ax=temp32&0xffff;
+		dx=(temp32>>16)&0xffff;
+
+		bx=ax;				// mov	bx,ax
+		cx=dx;				// mov	cx,dx
+
+		ax=(ax>>3)|(dx<<13);		// shrd	ax,dx,3
+
+		signed_ax=dx;
+		dx=signed_ax>>3;
+
+		temp32=ax+bx;			// add	ax,bx
+		ax=ax+bx;
+		dx=dx+cx;			// adc	dx,cx
+		if (temp32&(1<<16)) dx=dx+1;
+
+		temp32=(dx<<16)|(ax&0xffff);
+		ball_x=(temp32/sc)/8;
+
+		ball_x+=20;
+
+		/* if off end of screen, no need for shadow */
+
+		if (ball_x>39) continue;
+
+		/**********/
+		/* shadow */
+		/**********/
+
+		shadow_y=0x80000/sc/4;
+
+		/* center it */
+		shadow_y+=24;
+
+		/* if shadow off screen, don't draw */
+		if (shadow_y>47) continue;
+
+		/* draw shadow */
+		color_equals(0);
+		plot( (ball_x),shadow_y);
+
+		/********/
+		/* ball */
+		/********/
+
+		dot[d].yadd+=gravity;
+		newy=dot[d].y+dot[d].yadd;
+
+		temp32=newy;
+		if (temp32&0x8000) temp32|=0xffff0000;
+		if (temp32>=gravitybottom) {
+			ax=-dot[d].yadd;
+			temp32=(-dot[d].yadd)*gravityd;
+			ax=temp32&0xffff;
+
+			signed_ax=ax;
+			ax=signed_ax>>4;
+
+			dot[d].yadd=ax;
+			newy+=dot[d].yadd;
+		}
+
+		dot[d].y=newy;
+
+		/* sign extend */
+		temp32=newy;
+		if (temp32&0x8000) {
+			temp32|=0xffff0000;
+		}
+
+		temp32<<=6;
+
+		newy=temp32/sc/4;
+
+		/* center */
+		ball_y=newy+24;
+
+		/* don't draw if off screen */
+		if (ball_y>47) continue;
+
+		/* plot ball */
+		/* convert from 320x200 to 40x48 */
+		color_equals(6);
+		plot(ball_x,ball_y);
+
+	}
+
+	return;
+
+}
+
+
+
+static short isin(short deg) {
+	return(sin1024[deg&1023]);
+}
+
+static short icos(short deg) {
+	return(sin1024[(deg+256)&1023]);
+}
+
+static short dottaul[1024];
+
+int main(int argc,char **argv) {
+
+	short dropper;
+	short frame=0;
+	short rota=-1*64;
+	short rot=0,rots=0;
+	short a,b,c,d,i,j=0;
+	short grav,gravd;
+	short f=0;
+	int ch;
+
+	dropper=22000;
+	grav=3;
+	gravd=13;
+	gravitybottom=8105;
+
+	for(a=0;a<MAXDOTS;a++) {
+		dottaul[a]=a;
+	}
+
+	for(a=0;a<MAXDOTS-12;a++) {
+		b=rand()%MAXDOTS;
+		c=rand()%MAXDOTS;
+		d=dottaul[b];
+		dottaul[b]=dottaul[c];
+		dottaul[c]=d;
+	}
+
+	for(a=0;a<MAXDOTS;a++) {
+		dot[a].x=0;
+		dot[a].y=2560-dropper;
+		dot[a].z=0;
+		dot[a].yadd=0;
+	}
+
+	for(a=0;a<(MAXDOTS-12);a++) { // scramble
+		b=rand()%MAXDOTS;
+		c=rand()%MAXDOTS;
+		d=dot[b].x; dot[b].x=dot[c].x; dot[c].x=d;
+		d=dot[b].y; dot[b].y=dot[c].y; dot[c].y=d;
+		d=dot[b].z; dot[b].z=dot[c].z; dot[c].z=d;
+	}
+
+
+	grsim_init();
+
+	gr();
+
+	clear_screens();
+	soft_switch(MIXCLR);
+
+	ram[DRAW_PAGE]=0;
+
+	while(frame<1686) {
+
+		/* re-draw background */
+		color_equals(0);
+		for(a=0;a<24;a++) hlin(0,0,40,a);
+		color_equals(5);
+		for(a=24;a<48;a++) hlin(0,0,40,a);
+
+		frame++;
+		if(frame==355) f=0;
+
+		i=dottaul[j];
+		j++; j%=MAXDOTS;
+
+		/* initial spin */
+		if(frame<355) {
+//			dot[i].x=isin(f*11)*40;
+//			dot[i].y=icos(f*13)*10-dropper;
+//			dot[i].z=isin(f*17)*40;
+			dot[i].x=isin(f*8)*32;
+			dot[i].y=icos(f*16)*8-dropper;
+			dot[i].z=isin(f*16)*32;
+			dot[i].yadd=0;
+		}
+		/* bouncing ring */
+		else if(frame<643) {
+//			dot[i].x=icos(f*15)*55;
+//			dot[i].y=dropper;
+//			dot[i].z=isin(f*15)*55;
+//			dot[i].yadd=-260;
+			dot[i].x=icos(f*16)*48;
+			dot[i].y=dropper;
+			dot[i].z=isin(f*16)*48;
+			dot[i].yadd=-260;
+		}
+		/* fountain */
+		else if(frame<1214) {
+//			a=sin1024[frame&1023]/8;
+//			dot[i].x=icos(f*66)*a;
+//			dot[i].y=8000;
+//			dot[i].z=isin(f*66)*a;
+//			dot[i].yadd=-300;
+			a=sin1024[frame&1023]/8;
+			dot[i].x=icos(f*64)*a;
+			dot[i].y=8000;
+			dot[i].z=isin(f*64)*a;
+			dot[i].yadd=-300;
+		}
+		/* swirling */
+		else if(frame<1686) {
+			dot[i].x=rand()-16384;
+			dot[i].y=8000-rand()/2;
+			dot[i].z=rand()-16384;
+			dot[i].yadd=0;
+			if(frame>1357 && !(frame&31) && grav>0) grav--;
+		}
+
+		if(dropper>4000) dropper-=100;
+//rotsin=0; rotcos=64;
+		rotcos=icos(rot)*64; rotsin=isin(rot)*64;
+		rots+=2;
+
+		if(frame>1357) {
+			rot+=rota/64;
+			rota--;
+		}
+		else rot=isin(rots);
+
+		f++;
+		gravity=grav;
+		gravityd=gravd;
+
+		drawdots();
+
+		grsim_update();
+
+		/* approximate by 50Hz sleep */
+		usleep(20000);
+
+		ch=grsim_input();
+		if (ch==27) {
+			return 0;
+		}
+
+	}
+
+	return 0;
+}