X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fbakapee.c;h=b50c16e184212eb97efeae0c543f9a673abac50d;hb=7cbfb3d1f53e33107205d1d8a5ed215898246504;hp=2a6d3eefd245ff44f3c7b0323f23f98d8a48d884;hpb=e6e9a582ce32b990ea3fcd08f6386b1f83350ade;p=16.git

diff --git a/src/lib/bakapee.c b/src/lib/bakapee.c
old mode 100644
new mode 100755
index 2a6d3eef..b50c16e1
--- a/src/lib/bakapee.c
+++ b/src/lib/bakapee.c
@@ -1,10 +1,10 @@
 /* Project 16 Source Code~
- * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669
+ * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123
  *
  * This file is part of Project 16.
  *
  * Project 16 is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as publiSCREEN_HEIGHTed by
+ * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
@@ -13,7 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You SCREEN_HEIGHTould have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>, or
  * write to the Free Software Foundation, Inc., 51 Franklin Street,
  * Fifth Floor, Boston, MA 02110-1301 USA.
@@ -22,130 +22,115 @@
 
 #include "src/lib/bakapee.h"
 
-void pdump(page_t *pee)
+/* clrstdin() clear any leftover chars tha may be in stdin stream */
+void clrstdin()
 {
-	int mult=(QUADWH);
-	int palq=(mult)*TILEWH;
-	int palcol=0;
-	int palx, paly;
-	for(paly=0; paly<palq; paly+=mult){
-		for(palx=0; palx<palq; palx+=mult){
-				modexClearRegion(pee, palx+TILEWH, paly+TILEWH, mult, mult, palcol);
-			palcol++;
-		}
-	}
-}
-
-/////////////////////////////////////////////////////////////////////////////
-//																		 //
-// cls() - This clears the screen to the specified color, on the VGA or on //
-//		 the Virtual screen.											 //
-//																		 //
-/////////////////////////////////////////////////////////////////////////////
-void cls(page_t *page, byte color, byte *Where)
-{
-	//modexClearRegion(page, 0, 0, page->width, page->height, color);
-	_fmemset(Where, color, page->width*(page->height*2));
+   int ch = 0;
+   while( ( ch = getchar() ) != '\n' && ch != EOF );
 }
 
 //color ‚Ä‚·‚Æ
 void colortest(page_t *page, bakapee_t *pee)
 {
-	if(pee->gq < 256)
-	{
-		cls(page, pee->gq, VGA);
-		pee->gq++;
-	}else pee->gq = 0;
+	//if(pee->coor < 256)
+	//{
+		modexcls(page, pee->coor, VGA);
+		pee->coor++;
+	//}else pee->coor = 0;
 }
 
 //color ‚Ä‚·‚Æ
 void colorz(page_t *page, bakapee_t *pee)
 {
-	if(pee->gq <= HGQ)
+	if(pee->coor <= HGQ)
 	{
-		cls(page, pee->gq, VGA);
-		pee->gq++;
-	}else pee->gq = LGQ;
+		modexcls(page, pee->coor, VGA);
+		pee->coor++;
+	}else pee->coor = LGQ;
 }
 
 //slow spectrum down
 void ssd(page_t *page, bakapee_t *pee, word svq)
 {
-	if(pee->sy < SCREEN_HEIGHT+1)
+	if(pee->sy < page->sh+1)
 	{
-		if(pee->sx < SCREEN_WIDTH+1)
+		if(pee->sx < page->sw+1)
 		{
 			//mxPutPixel(sx, sy, coor);
-			printf("%d %d %d %d\n", pee->sx, pee->sy, svq, pee->coor);
+			//printf("%d %d %d %d\n", pee->sx, pee->sy, svq, pee->coor);
+			dingpp(page, pee);
 			pee->sx++;
 		}else pee->sx = 0;
-		if(pee->sx == SCREEN_WIDTH)
+		if(pee->sx == page->sw)
 		{
 			pee->sy++;
 			if(svq == 7) pee->coor++;
-			if(pee->sy == SCREEN_HEIGHT && svq == 8) pee->coor = rand()%256;
+			if(pee->sy == page->sh && svq == 8) pee->coor = rand()%256;
 		}
 	}else pee->sy = 0;
 }
 
+//plot pixel or plot tile
 void dingpp(page_t *page, bakapee_t *pee)
 {
-#ifdef TILE
-	modexClearRegion(page, pee->xx, pee->yy, TILEWH, TILEWH, pee->coor);
+	if(pee->tile)
+	{
+#ifndef MXLIB
+	//fill_block(pee->xx, pee->yy, pee->xx+TILEWH, pee->yy+TILEWH, pee->coor);
+		mxFillBox(pee->xx, pee->yy, TILEWH, TILEWH, pee->coor, OP_SET);
 #else
-	modexputPixel(page, pee->xx, pee->yy, pee->coor);
+		modexClearRegion(page, pee->xx, pee->yy, TILEWH, TILEWH, pee->coor);
 #endif
+	}
+	else
+		modexputPixel(page, pee->xx, pee->yy, pee->coor);
 }
 
-void dingo(bakapee_t *pee)
+void dingo(page_t *page, bakapee_t *pee)
 {
-	#ifdef TILE
-	if(pee->xx<0) pee->xx=(SCREEN_WIDTH-TILEWH);
-	if(pee->yy<0) pee->yy=(SCREEN_HEIGHT-TILEWH);
-	if(pee->xx>(SCREEN_WIDTH-TILEWH)) pee->xx=0;
-	if(pee->yy>(SCREEN_HEIGHT-TILEWH)/*+(TILEWH*BUFFMX)*/) pee->yy=0;
-	#else
-	if(pee->xx<0) pee->xx=SCREEN_WIDTH;
-	if(pee->yy<0) pee->yy=SCREEN_HEIGHT;
-	if(pee->xx>SCREEN_WIDTH) pee->xx=0;
-	if(pee->yy>SCREEN_HEIGHT) pee->yy=0;
-	#endif
+	if(pee->tile)
+	{
+		if(pee->xx<0) pee->xx=(page->sw-TILEWH);
+		if(pee->yy<0) pee->yy=(page->sh-TILEWH);
+		if(pee->xx>(page->sw-TILEWH)) pee->xx=0;
+		if(pee->yy>(page->sh-TILEWH)/*+(TILEWH*BUFFMX)*/) pee->yy=0;
+	}
+		else
+	{
+		if(pee->xx<0) pee->xx=page->sw;
+		if(pee->yy<0) pee->yy=page->sh;
+		if(pee->xx>page->sw) pee->xx=0;
+		if(pee->yy>page->sh) pee->yy=0;
+	}
 }
 
+//assigning values from randomizer
 void dingas(bakapee_t *pee)
 {
-	if(pee->qq == BONK) dingu(pee);
+	if(pee->gq == BONK) dingu(pee);
 	if(!pee->bakax)
 	{
-		#ifdef TILE
+		if(pee->tile)
 		pee->xx-=TILEWH;
-		#else
-		pee->xx--;
-		#endif
+		else pee->xx--;
 	}
 	else if(pee->bakax>1)
 	{
-		#ifdef TILE
+		if(pee->tile)
 		pee->xx+=TILEWH;
-		#else
-		pee->xx++;
-		#endif
+		else pee->xx++;
 	}
 	if(!pee->bakay)
 	{
-		#ifdef TILE
+		if(pee->tile)
 		pee->yy-=TILEWH;
-		#else
-		pee->yy--;
-		#endif
+		else pee->yy--;
 	}
 	else if(pee->bakay>1)
 	{
-		#ifdef TILE
+		if(pee->tile)
 		pee->yy+=TILEWH;
-		#else
-		pee->yy++;
-		#endif
+		else pee->yy++;
 	}
 }
 
@@ -160,16 +145,17 @@ void dingu(bakapee_t *pee)
 	}
 }
 
+//randomizer
 void dingq(bakapee_t *pee)
 {
-	if(pee->qq<BONK)
+	if(pee->gq<BONK)
 	{
-		pee->qq++;
+		pee->gq++;
 	}
 	else
 	{
 		dingu(pee);
-		pee->qq = 0;
+		pee->gq = 0;
 	}
 	pee->bakax = rand()%3; pee->bakay = rand()%3;
 }
@@ -184,31 +170,30 @@ void ding(page_t *page, bakapee_t *pee, word q)
 	{
 		case 1:
 			dingq(pee);
-			if(pee->xx==SCREEN_WIDTH){pee->bakax=0;}
+			if(pee->xx==page->sw){pee->bakax=0;}
 			if(pee->xx==0){pee->bakax=1;}
-			if(pee->yy==SCREEN_HEIGHT){pee->bakay=0;}
+			if(pee->yy==page->sh){pee->bakay=0;}
 			if(pee->yy==0){pee->bakay=1;}
 		break;
 		case 2:
 			dingq(pee);
 			dingas(pee);
-			dingo(pee);
+			dingo(page, pee);
 			dingpp(page, pee);	//plot the pixel/tile
-#ifdef TILE
+			if(pee->tile)
 			modexClearRegion(page, (rand()*TILEWH)%page->width, (rand()*TILEWH)%(page->height), TILEWH, TILEWH, 0);
-#else
+			else
 			modexputPixel(page, rand()%page->width, rand()%page->height, 0);
-#endif
 		break;
 		case 3:
 			dingq(pee);
-			if(pee->xx!=SCREEN_WIDTH||pee->yy!=SCREEN_HEIGHT)
+			if(pee->xx!=page->sw||pee->yy!=page->sh)
 			{
 				if(pee->xx==0){pee->bakax=1;pee->bakay=-1;d3y=1;}
 				if(pee->yy==0){pee->bakax=1;pee->bakay=0;d3y=1;}
-				if(pee->xx==SCREEN_WIDTH){pee->bakax=-1;pee->bakay=-1;d3y=1;}
-				if(pee->yy==SCREEN_HEIGHT){pee->bakax=1;pee->bakay=0;d3y=1;}
-			}else if(pee->xx==SCREEN_WIDTH&&pee->yy==SCREEN_HEIGHT) pee->xx=pee->yy=0;
+				if(pee->xx==page->sw){pee->bakax=-1;pee->bakay=-1;d3y=1;}
+				if(pee->yy==page->sh){pee->bakax=1;pee->bakay=0;d3y=1;}
+			}else if(pee->xx==page->sw&&pee->yy==page->sh) pee->xx=pee->yy=0;
 			if(d3y)
 			{
 				if(pee->bakay<0)
@@ -235,7 +220,7 @@ void ding(page_t *page, bakapee_t *pee, word q)
 		case 4:
 			dingq(pee);
 			dingas(pee);
-			dingo(pee);
+			dingo(page, pee);
 			dingpp(page, pee);	//plot the pixel/tile
 		break;
 		case 5:
@@ -243,25 +228,25 @@ void ding(page_t *page, bakapee_t *pee, word q)
 		break;
 		case 6:
 			pee->coor = rand()%256;
-			cls(page, pee->coor, VGA);
+			modexcls(page, pee->coor, VGA);
 		break;
 		case 7:
-			if(pee->gq <= HGQ)
+			if(pee->coor <= HGQ)
 			{
 				ssd(page, pee, q);
-				pee->gq++;
-			}else pee->gq = LGQ;
+				pee->coor++;
+			}else pee->coor = LGQ;
 		break;
 		case 8:
 			colorz(page, pee);
-			modexprint(page, SCREEN_WIDTH/2, SCREEN_HEIGHT/2, 1, 47, 0, "bakapi");
+			modexprint(page, page->sw/2, page->sh/2, 1, 47, 0, "bakapi");
 		break;
 		case 9:
-			if(pee->gq <= HGQ)
+			if(pee->coor <= HGQ)
 			{
-				ssd(page, pee, q); pee->coor++;
-				pee->gq++;
-			}else pee->gq = LGQ;
+				ssd(page, pee, q);
+				pee->coor++;
+			}else pee->coor = LGQ;
 		break;
 		case 10:
 			ssd(page, pee, q); /*printf("%d\n", pee->coor);*/
@@ -280,11 +265,10 @@ void ding(page_t *page, bakapee_t *pee, word q)
 			tx+=pee->xx+TILEWH+4;
 			ty+=pee->yy+TILEWH+4;
 			modexClearRegion(page, tx, ty, 4, 4, pee->coor);
-#ifdef TILE
+			if(pee->tile)
 			modexClearRegion(page, (rand()*TILEWH)%page->width, (rand()*TILEWH)%(page->height), TILEWH, TILEWH, 0);
-#else
+			else
 			modexputPixel(page, rand()%page->width, rand()%(page->height), 0);
-#endif
 			//printf("%d %d %d %d %d %d\n", pee->xx, pee->yy, tx, ty, TILEWH);
 		break;
 		default: