X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;ds=inline;f=16%2Fdos_gfx.cpp;h=268b99ae5f9393febd76d0e967ba3a385450f477;hb=e26d9f2f0a5705ab73e9b531000f1fad8a1a5466;hp=cbfa2d61702ef04eaa5aeb1dee463d8cdd7a205a;hpb=ea28213f8d38c309e28cd61b2cc9f53a6758f4e2;p=16.git

diff --git a/16/dos_gfx.cpp b/16/dos_gfx.cpp
index cbfa2d61..268b99ae 100644
--- a/16/dos_gfx.cpp
+++ b/16/dos_gfx.cpp
@@ -1,7 +1,8 @@
 //DOS Graphics thingy by sparky4 licence GPL v2
 //a special thanks to everyone to release source code for mode X
 /*src\lib\*/
-#include "dos_gfx.h"
+#include "dos_gfx.h"
+//#include "lib\modex16.h" //____
 
 int old_mode;
 //color ‚Ä‚·‚Æ
@@ -9,7 +10,7 @@ short gq = LGQ;
 
 //‚Ä‚·‚Æ
 short bakax = 0, bakay = 0;
-syte xx = rand()&0%SW, yy = rand()&0%SH, sx = 0, sy = 0;
+word xx = rand()&0%SW, yy = rand()&0%SH, sx = 0, sy = 0;
 byte coor;
 
 byte *vga = (byte *) MK_FP(0xA000, 0);
@@ -19,7 +20,7 @@ byte *vga = (byte *) MK_FP(0xA000, 0);
  * to be included.
  */
 #define TESTING
-#define TILE
+//#define TILE
 
 /////////////////////////////////////////////////////////////////////////////
 //                                                                         //
@@ -51,12 +52,24 @@ void setvideo(/*byte mode, */short vq){
 				mxSetVirtualScreen(VW,BH);
 //				mxSetVirtualScreen((640-(TILEWH*4)),(480-(TILEWH*4)));
 				mxSetClip(true);
-				mxSetClipRegion(0, 0, VW, BH);
+				mxSetClipRegion(0, 0, VW, BH);
 				mxPan(TILEWH*2,TILEWH*2);
 				//mxSetClipRegion(0, VH+1, VW, (TILEWH*BUFFMX));
 		}
 }
 
+void pdump(){
+	int mult=(QUADWH)/2;
+	int palq=(mult)*16;
+	int palcol=0;
+	for(int paly=0; paly<palq; paly+=mult){
+		for(int palx=0; palx<palq; palx+=mult){
+				mxFillBox((SW-palq)+palx+32, paly+32, TILEWH, TILEWH, palcol, OP_SET);
+			palcol++;
+		}
+	}
+}
+
 /////////////////////////////////////////////////////////////////////////////
 //																		 //
 // cls() - This clears the screen to the specified color, on the VGA or on //
@@ -78,7 +91,7 @@ short colortest(){
 
 //color ‚Ä‚·‚Æ
 short colorz(){
-		if(gq < HGQ){
+		if(gq <= HGQ){
 //----		  cls(gq, vaddr);
 				cls(gq, vga);
 				gq++;
@@ -115,7 +128,7 @@ short ding(int q){
 		||q==16
 		) && gq == BONK){
 						if(coor < HGQ && coor < LGQ) coor = LGQ;
-						if(coor < HGQ-1){
+						if(coor < HGQ){
 								coor++;
 				}else{ coor = LGQ;
 						bakax = rand()%3; bakay = rand()%3;
@@ -133,7 +146,7 @@ short ding(int q){
 		}
 
 		if(q==7||q==9){
-				if(gq < HGQ){
+				if(gq <= HGQ){
 						if(q == 7) ssd(q);
 						if(q == 9){ ssd(q); coor++; }
 						gq++;
@@ -245,11 +258,11 @@ short ding(int q){
 					#endif
 				} 
 
-				if(q==2)
-				#ifdef TILE
-					mxFillBox((rand()*TILEWH)%VW, (rand()*TILEWH)%(VH), TILEWH, TILEWH, 0, OP_SET);
-				#else
-					mxPutPixel(rand()%VW, rand()%(VH), 0);
+				if(q==2)
+				#ifdef TILE
+					mxFillBox((rand()*TILEWH)%VW, (rand()*TILEWH)%(VH), TILEWH, TILEWH, 0, OP_SET);
+				#else
+					mxPutPixel(rand()%VW, rand()%(VH), 0);
 				#endif
 				if(q==16) mxPutPixel(rand()%VW, rand()%(VH), 0);
 				if(q==2||q==4||q==16){ bakax = rand()%3; bakay = rand()%3; }  //random 3 switch
@@ -272,7 +285,9 @@ short ding(int q){
  */
 
 int main(void)
-		{
+		{
+		//bitmap_t bmp; //____
+		//bmp = modexLoadPcx("chikyuu.pcx"); //____
 		short key,d,xpos,ypos,xdir,ydir;
 		int ch=0x0;
 		// main variables
@@ -282,7 +297,10 @@ int main(void)
 		ypos=TILEWH*2;
 		xdir=1;
 		ydir=1;
-		setvideo(1);
+		setvideo(1);
+		//modexPalUpdate(bmp.palette); //____
+		//modexDrawBmp(VGA, 0, 0, &bmp, 0); //____
+		//getch(); //____
 // screen savers
 
 /*while(d!=0){ // on!
@@ -298,6 +316,7 @@ int main(void)
 						setvideo(1);
 				}
 		}*/ // else off
+		//mxFillBox(0, 0, VW, BH, 10, OP_SET);
 		while(1){ // conditions of screen saver
 		while(!kbhit()){
 			ding(key);
@@ -324,8 +343,9 @@ int main(void)
 				mxPutPixel(0, y, 15);
 				mxPutPixel(VW-1, y, 15);
 			}
-			
-			getch();*/
+			*/
+			pdump();
+			getch();
 			//text box
 			mxSetTextColor(10, OP_TRANS); //set font
 			mxBitBlt(xpos, ypos+(TILEWH*12), SW, TILEWH*BUFFMX, 0, BS); //copy background
@@ -340,38 +360,38 @@ int main(void)
 			mxFillBox(xpos+QUADWH, ypos+QUADWH+(TILEWH*12), TILEWH*2, TILEWH*2, 9, OP_SET); //portriat~
 			getch();
 			mxBitBlt(0, BS, SW, TILEWH*BUFFMX, xpos, ypos+(TILEWH*12)); //copy background
-			//mxBitBlt(0, (TILEWH*12)+1, 320, TILEWH*3, 0, 0);
 			getch();
 		while(!kbhit()){
-//			hScroll(1);
-//			scrolly(1);
-//			vScroll(1);
-//			delay(100);
 			//for(int i=0;i<TILEWH;i++){
 				
 				ding(key);
-				mxPan(xpos,ypos);
-				mxBitBlt(xpos, ypos, SW, SH, 0, SH);
+				mxPan(xpos,ypos);
+mxFillBox(384, 304, 384, 304, 10, OP_SET);
+//mxBitBlt(xpos, ypos, SW, SH, 32, (SH+64+32));
+mxBitBlt(TILEWH*2, TILEWH*2, SW, SH, 32, (SH+64+32));
 				//for(short o = 0; o<TILEWH; o++){
 					xpos+=xdir;
 					ypos+=ydir;
-					//if(ypos==1 || (ypos==(BH-SH-1)))delay(500);
+					//if(ypos==1 || (ypos==(BH-SH-1)))delay(500);
 					//if((xpos>(VW-SW-1)) || (xpos<1))delay(500);
-					//mxWaitRetrace();
-					mxPan(TILEWH*2,TILEWH*2);
-					mxBitBlt(0, SH, SW, SH, xpos, ypos);
+					//mxWaitRetrace();
+//mxBitBlt(32, (SH+32), SW, SH, xpos, ypos);
+mxBitBlt(TILEWH*2, (SH+64+32), SW, SH, TILEWH*2, TILEWH*2);
+//xpos=ypos=TILEWH*2;
+mxPan(32,32);
 				//}
 				if( (xpos>(VW-SW-1))  || (xpos<1)){xdir=-xdir;}
 				if( (ypos>(BH-SH-1)) || (ypos<1)){ydir=-ydir;} // { Hit a boundry, change
-			//    direction! }
-			
+			//    direction! }
+//mxBitBlt(32, (SH+64+32), SW, SH, xpos, ypos);
+//mxBitBlt(TILEWH*2, (SH+64+32), SW, SH, TILEWH*2, TILEWH*2);
 			}
 			ch=getch();
 			if(ch==0x71)break; // 'q'
 			if(ch==0x1b)break; // 'ESC'
 		}
 		setvideo(0);
-		printf("wwww\nFull Buffer Virtual Resolution: %dx%d\n", VW,BH);
+		printf("wwww\nFull Buffer Virtual Resolution: %dx%d\n", VW,BH);
 		printf("Virtual Resolution: %dx%d\n", VW,VH);
 		printf("Resolution: %dx%d\n", SW,SH);
 		printf("Mode X Library Version: %d\n", mxGetVersion());