From: sparky4 <sparky4@cock.li>
Date: Mon, 13 Jul 2015 15:11:36 +0000 (-0500)
Subject: added graphical extention~
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=955fbfccabe133190ea0dfca8b9c7baeafcaf34e;p=16.git

added graphical extention~
	modified:   fonttes0.exe
	modified:   fonttest.exe
	modified:   makefile
	modified:   src/fonttes0.c
---

diff --git a/fonttes0.exe b/fonttes0.exe
index 893906f6..6033b087 100644
Binary files a/fonttes0.exe and b/fonttes0.exe differ
diff --git a/fonttest.exe b/fonttest.exe
index 12c438dd..d4805671 100644
Binary files a/fonttest.exe and b/fonttest.exe differ
diff --git a/makefile b/makefile
index cfe71842..20796d08 100644
--- a/makefile
+++ b/makefile
@@ -110,10 +110,10 @@ fmemtest.$(OBJ): $(SRC)fmemtest.c
 	wcl $(FLAGS) -c $(SRC)fmemtest.c
 
 fonttest.$(OBJ): $(SRC)fonttest.c
-	wcl -c $(SRC)fonttest.c
+	wcl $(FLAGS) -c $(SRC)fonttest.c
 
 fonttes0.$(OBJ): $(SRC)fonttes0.c
-        wcl -c $(SRC)fonttes0.c
+        wcl $(FLAGS) -c $(SRC)fonttes0.c
 
 inputest.$(OBJ): $(SRC)inputest.c
 	wcl $(FLAGS) -c $(SRC)inputest.c
@@ -149,7 +149,7 @@ wcpu.$(OBJ): $(WCPULIB)wcpu.h $(WCPULIB)wcpu.c
 	wcl $(FLAGS) -c $(WCPULIB)wcpu.c
 
 16text.$(OBJ): $(SRCLIB)16text.c
-	wcl -c $(SRCLIB)16text.c
+	wcl $(FLAGS) -c $(SRCLIB)16text.c
 
 mapread.$(OBJ): $(SRCLIB)mapread.h $(SRCLIB)mapread.c 16.lib
 	wcl $(FLAGS) -c $(SRCLIB)mapread.c 16.lib
diff --git a/src/fonttes0.c b/src/fonttes0.c
index d45039d0..5f6da62f 100644
--- a/src/fonttes0.c
+++ b/src/fonttes0.c
@@ -22,7 +22,8 @@
 #include <stdio.h>
 #include <conio.h>
 #include "lib/types.h"
-#include "lib/16text.h"
+#include "lib/16text.h"
+#include "lib/modex16.h"
 
 void main(int argc, char *argv[])
 {
@@ -31,7 +32,9 @@ void main(int argc, char *argv[])
 	char l[16];
     char c;
     word s, o, t, w;
-    word addr = (word) l;
+    word addr = (word) l;
+    byte *pal, *pal2;
+	page_t page;
     textInit();
 
     //print the addresses of the fonts
@@ -96,9 +99,28 @@ void main(int argc, char *argv[])
 		DEC CX
 		JNZ L1
     }
+    /* load our palette */
+    modexLoadPalFile("data/default.pal", &pal2);
 
-    //render the letter in ascii art
-    for(i=0; i<w; i++) {
+    /* save the palette */
+    pal  = modexNewPal();
+    modexPalSave(pal);
+    modexFadeOff(1, pal);
+    modexPalBlack();
+
+    modexEnter();
+    modexPalBlack();
+
+    /* set up the page, but with 16 pixels on all borders in offscreen mem */
+    page=modexDefaultPage();
+    page.width += 32;
+    page.height += 32;
+	modexShowPage(&page);
+	/* fade in */
+	modexFadeOn(1, pal2);
+
+	//render the letter in ascii art
+	for(i=0; i<w; i++) {
 	j=1<<8;
 	while(j) {
 	    //printf("%c", l[i] & j ? '*':' ');
@@ -108,5 +130,13 @@ void main(int argc, char *argv[])
 	    j>>=1;
 	}
 	printf("\n");
-    }
+    }
+
+	/* fade back to text mode */
+	modexFadeOff(1, pal2);
+	modexPalBlack();
+	modexLeave();
+	modexPalBlack();
+	modexFadeOn(1, pal);
+
 }