From: sparky4 Date: Thu, 5 Nov 2015 21:10:16 +0000 (-0600) Subject: attempted~ X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=6c3ff0c690efc48321f0cd69177601dfbfcc5c37;p=16.git attempted~ --- diff --git a/16.exe b/16.exe deleted file mode 100755 index 48fb8651..00000000 Binary files a/16.exe and /dev/null differ diff --git a/bakapi.exe b/bakapi.exe deleted file mode 100755 index 5e828835..00000000 Binary files a/bakapi.exe and /dev/null differ diff --git a/exmmtest.exe b/exmmtest.exe deleted file mode 100755 index 3e842ea0..00000000 Binary files a/exmmtest.exe and /dev/null differ diff --git a/fmemtest.exe b/fmemtest.exe deleted file mode 100755 index 5b900e67..00000000 Binary files a/fmemtest.exe and /dev/null differ diff --git a/fontgfx.exe b/fontgfx.exe deleted file mode 100755 index ebcea9a2..00000000 Binary files a/fontgfx.exe and /dev/null differ diff --git a/fonttest.exe b/fonttest.exe deleted file mode 100755 index f92b49a3..00000000 Binary files a/fonttest.exe and /dev/null differ diff --git a/inputest.exe b/inputest.exe deleted file mode 100755 index 57ffb9f2..00000000 Binary files a/inputest.exe and /dev/null differ diff --git a/maptest.exe b/maptest.exe deleted file mode 100755 index cb781a89..00000000 Binary files a/maptest.exe and /dev/null differ diff --git a/palettec.exe b/palettec.exe deleted file mode 100755 index 22bbb34a..00000000 Binary files a/palettec.exe and /dev/null differ diff --git a/palettel.exe b/palettel.exe deleted file mode 100755 index 125e58f2..00000000 Binary files a/palettel.exe and /dev/null differ diff --git a/pcxtest.exe b/pcxtest.exe deleted file mode 100755 index ce969505..00000000 Binary files a/pcxtest.exe and /dev/null differ diff --git a/pcxtest2.exe b/pcxtest2.exe deleted file mode 100755 index c5a32e5a..00000000 Binary files a/pcxtest2.exe and /dev/null differ diff --git a/planrpcx.exe b/planrpcx.exe deleted file mode 100755 index 1a4ceb08..00000000 Binary files a/planrpcx.exe and /dev/null differ diff --git a/scroll.exe b/scroll.exe deleted file mode 100755 index ce081df5..00000000 Binary files a/scroll.exe and /dev/null differ diff --git a/src/lib/modex16.h b/src/lib/modex16.h index 16ba90db..f8bbb2d1 100755 --- a/src/lib/modex16.h +++ b/src/lib/modex16.h @@ -37,6 +37,7 @@ #include "src/lib/modex16/256x192.h" #include "src/lib/modex16/192x144_.h" #include "src/lib/modex16/160x120.h" +#include "src/lib/modex16/planar16.h" //320x240 = 20x15 //192x144 = 12x9 diff --git a/src/lib/modex16/16render.h b/src/lib/modex16/16render.h index 4b2ebcd9..fca68819 100755 --- a/src/lib/modex16/16render.h +++ b/src/lib/modex16/16render.h @@ -23,6 +23,7 @@ #ifndef __RENDER_H__ #define __RENDER_H__ +#include "src/lib/planar.h" #include "src/lib/modex16.h" void modexDrawPBufRegion(page_t *page, int x, int y, int rx, int ry, int rw, int rh, planar_buf_t *p, boolean sprite); diff --git a/src/lib/modex16/planar16.c b/src/lib/modex16/planar16.c index 3ed90c08..55bbb473 100755 --- a/src/lib/modex16/planar16.c +++ b/src/lib/modex16/planar16.c @@ -47,7 +47,7 @@ static struct pcxHeader { } head; -static void loadPcxStage1(FILE *file, planar_buf_t *result) { +static void loadPcxpbufStage1(FILE *file, planar_buf_t *result) { int index; byte count, val; long int pos; @@ -67,7 +67,7 @@ static void loadPcxStage1(FILE *file, planar_buf_t *result) { } } -static void loadPcxPalette(FILE *file, planar_buf_t *result) { +static void loadPcxpbufPalette(FILE *file, planar_buf_t *result) { byte val; int index; @@ -107,11 +107,11 @@ planar_buf_t planarLoadPcx(char *filename) } /* load the first part of the pcx file */ - loadPcxStage1(file, &result); + loadPcxpbufStage1(file, &result); /* allocate the buffer */ bufSize = (/*(dword)*/result.width * result.height); - result = *planar_buf_alloc(result.width, result.height); + //result = pbuf_alloc(result.width, result.height); if(!result.plane[0]) { fprintf(stderr, "Could not allocate memory for bitmap data."); fclose(file); @@ -146,7 +146,7 @@ planar_buf_t planarLoadPcx(char *filename) } } while(index < bufSize); - loadPcxPalette(file, &result); + //++++loadPcxpbufPalette(file, &result); fclose(file); return result; diff --git a/src/lib/modex16/planar16.h b/src/lib/modex16/planar16.h index bf8334ae..8f2de898 100755 --- a/src/lib/modex16/planar16.h +++ b/src/lib/modex16/planar16.h @@ -25,13 +25,10 @@ * Functions and types for loading and manipulating bitmaps. */ -#ifndef PLANARW_H -#define PLANARW_H +#ifndef PLANW_H +#define PLANW_H -#include "src/lib/16_head.h" -#include "src/lib/planar.h" - -#define PALSIZE 768 +#include "src/lib/modex16.h" planar_buf_t planarLoadPcx(char *filename); tileset_t planarLoadPcxTiles(char *filename, word twidth, word theight); diff --git a/src/lib/planar.h b/src/lib/planar.h index 70c20b70..6e3da953 100755 --- a/src/lib/planar.h +++ b/src/lib/planar.h @@ -26,9 +26,7 @@ #ifndef PLANAR_H #define PLANAR_H -#include "src/lib/bitmap.h" - -extern byte *modexNewPal(); +#include "src/lib/modex16.h" typedef struct { byte huge *plane[4]; /* 4 planes of image data */ diff --git a/src/planrpcx.c b/src/planrpcx.c index fdbc6df3..7a703c26 100755 --- a/src/planrpcx.c +++ b/src/planrpcx.c @@ -55,21 +55,21 @@ baka = 1; p = planarLoadPcx(bakapeee); ptmp = planarLoadPcx("data/ptmp.pcx"); - VGAmodeX(baka, &gvar); +/* VGAmodeX(baka, &gvar); gvar.video.page[0]=modexDefaultPage(&gvar.video.page[0]); - /* fix up the palette and everything */ + //fix up the palette and everything modexPalUpdate1(p.palette); - /* clear and draw one sprite and one bitmap */ + //clear and draw one sprite and one bitmap modexClearRegion(&gvar.video.page[0], 0, 0, gvar.video.page[0].sw, gvar.video.page[0].sh, 0); - /* update display~*/ + //update display~ gvar.video.page[0].dx+=32; gvar.video.page[0].dy+=32; modexShowPage(&gvar.video.page[0]); - /* non sprite comparison */ + //non sprite comparison start = *clockw; // oldDrawBmp(VGA, 20, 20, &bmp, 0); for(i=0; i<100 ;i++) { @@ -92,9 +92,9 @@ baka = 1; while(!kbhit()) { } - VGAmodeX(0, &gvar); + VGAmodeX(0, &gvar);*/ - /* print out the contents of each plane */ + //print out the contents of each plane for(plane=0; plane < 4; plane++) { i=0; printf("Plane %d\n", plane); diff --git a/test.exe b/test.exe deleted file mode 100755 index c9843178..00000000 Binary files a/test.exe and /dev/null differ diff --git a/test2.exe b/test2.exe deleted file mode 100755 index 527a1589..00000000 Binary files a/test2.exe and /dev/null differ diff --git a/tesuto.exe b/tesuto.exe deleted file mode 100755 index 6dbf027e..00000000 Binary files a/tesuto.exe and /dev/null differ diff --git a/vgmtest.exe b/vgmtest.exe deleted file mode 100755 index b63d956e..00000000 Binary files a/vgmtest.exe and /dev/null differ