X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fpcxtest.c;h=ba69690221e612609adb2926084a5d6c2b7d0a9f;hb=0df3c2d5e81ce6a2f1d498b3107e1fd223e7af80;hp=989aa58fef5b182f2bcbc5d74614d777147da6fb;hpb=e0335fc72d6856ec3df7a081281ebd8f36e3981d;p=16.git
diff --git a/src/pcxtest.c b/src/pcxtest.c
old mode 100644
new mode 100755
index 989aa58f..ba696902
--- a/src/pcxtest.c
+++ b/src/pcxtest.c
@@ -1,132 +1,141 @@
-/* Project 16 Source Code~
- * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669
- *
- * 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 published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * Project 16 is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see , or
- * write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301 USA.
- *
- */
-
-#include
-#include
+/* Project 16 Source Code~
+ * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
+ *
+ * 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 published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Project 16 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see , or
+ * write to the Free Software Foundation, Inc., 51 Franklin Street,
+ * Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
+#include
+#include
#include
-#include "src/lib/modex16.h"
-#include "src/lib/bitmap.h"
-#include "src/lib/planar.c"
-
-word far* clockw= (word far*) 0x046C; /* 18.2hz clock */
-
-/*
-void
-DrawPBuf(page_t *page, int x, int y, planar_buf_t *p, byte sprite)
-{
- byte plane;
- word px, py;
- word offset;
-
- // TODO Make this fast. It's SLOOOOOOW
- for(plane=0; plane < 4; plane++) {
- modexSelectPlane(PLANE(plane+x));
- for(px = plane; px < p->width; px+=4) {
- offset=px;
- for(py=0; pyheight/2; py++) {
- SELECT_ALL_PLANES();
- if(!sprite || p->plane[offset])
- page->data = p->plane;
- //offset+=p->width;
- //offset++;
- }
- }
- }
-}
-*/
+#include "src/lib/16_vl.h"
+#include "src/lib/bitmap.h"
+#include "16/src/lib/16render.h"
+#include "src/lib/16_in.h"
+
+#include "src/lib/16_tail.h"
+
+static word far* clockw= (word far*) 0x046C; /* 18.2hz clock */
+
+#define PCXBMPVAR gvar.player[0].data
+#define PCXBMP *PCXBMPVAR
+#define PCXBMPPTR PCXBMPVAR
void main() {
- bitmap_t bmp;
- planar_buf_t *p;
- int i;
- page_t page;
- word start;
- int plane;
+ static global_game_variables_t gvar;
+//---- planar_buf_t *p;
+ word start;
float t1, t2;
- page=modexDefaultPage();
+ // DOSLIB: check our environment
+ probe_dos();
+
+ // DOSLIB: what CPU are we using?
+ // NTS: I can see from the makefile Sparky4 intends this to run on 8088 by the -0 switch in CFLAGS.
+ // So this code by itself shouldn't care too much what CPU it's running on. Except that other
+ // parts of this project (DOSLIB itself) rely on CPU detection to know what is appropriate for
+ // the CPU to carry out tasks. --J.C.
+ cpu_probe();
+
+ // DOSLIB: check for VGA
+ if (!probe_vga()) {
+ printf("VGA probe failed\n");
+ return;
+ }
+ // hardware must be VGA or higher!
+ if (!(vga_state.vga_flags & VGA_IS_VGA)) {
+ printf("This program requires VGA or higher graphics hardware\n");
+ return;
+ }
+
+//0000 PCXBMP = bitmapLoadPcx("data/koishi~~.pcx");
+ PCXBMP = bitmapLoadPcx("data/chikyuu.pcx", &gvar);
+// PCXBMP = bitmapLoadPcx("data/koishi^^.pcx");
+// PCXBMP = bitmapLoadPcx("16/PCX_LIB/chikyuu.pcx");
+//---- p = planar_buf_from_bitmap(PCXBMPPTR);
-//0000 bmp = bitmapLoadPcx("data/koishi~~.pcx");
-// bmp = bitmapLoadPcx("data/chikyuu.pcx");
- bmp = bitmapLoadPcx("data/koishi^^.pcx");
-// bmp = bitmapLoadPcx("16/PCX_LIB/chikyuu.pcx");
- p = planar_buf_from_bitmap(&bmp);
- modexEnter();
+ VGAmodeX(1, 1, &gvar);
+ gvar.video.page[0]=modexDefaultPage(&gvar.video.page[0]);
/* fix up the palette and everything */
- modexPalUpdate1(bmp.palette);
+ modexPalUpdate(&PCXBMP->palette);
/* clear and draw one sprite and one bitmap */
- modexClearRegion(&page, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 1);
+ modexClearRegion(&gvar.video.page[0], 0, 0, gvar.video.page[0].width, gvar.video.page[0].height, 1);
- /* non sprite comparison */
- start = *clockw;
- for(i=0; i<100 ;i++) {
- oldDrawBmp(VGA, 20, 20, &bmp, 0);
- }
+ /* non sprite comparison */
+ /*start = *clockw;
+ //for(i=0; i<100 ;i++) {
+ oldDrawBmp(VGA, 0, 0, PCXBMPPTR, 0);
+ //}
start = *clockw;
- for(i=0; i<100 ;i++) {
-//0000 modexDrawBmp(&page, 20, 20, &bmp);
- modexDrawBmp(&page, 0, 0, &bmp);
- }
+ //for(i=0; i<100 ;i++) {
+//0000 modexDrawBmp(&gvar.video.page[0], 20, 20, PCXBMPPTR);
+ modexDrawBmp(&gvar.video.page[0], 160, 120, PCXBMPPTR);
+ //}
t1 = (*clockw-start) /18.2;
start = *clockw;
- for(i=0; i<100; i++) {
-//0000 modexCopyPageRegion(&page, &page, 20, 20, 128, 20, 64, 64);
- modexCopyPageRegion(&page, &page, 0, 0, 0, 0, 320, 240);
- }
- t2 = (*clockw-start)/18.2;
+ //for(i=0; i<100; i++) {
+//0000 modexCopyPageRegion(&gvar.video.page[0], &gvar.video.page[0], 20, 20, 128, 20, 64, 64);
+ modexCopyPageRegion(&gvar.video.page[0], &gvar.video.page[0], 0, 0, 0, 0, 320, 240);
+ //}
+ t2 = (*clockw-start)/18.2;*/
start = *clockw;
- for(i=0; i<100 ;i++) {
- oldDrawBmp(VGA, 20, 20, &bmp, 1);
- }
+ //for(i=0; i<100 ;i++) {
+ oldDrawBmp(VGA, 0, 0, PCXBMPPTR, 1);
+ //}
+ t1 = (*clockw-start) /18.2;
start = *clockw;
- for(i=0; i<100 ;i++) {
-//0000 modexDrawSprite(&page, 20, 20, &bmp);
- modexDrawSprite(&page, 0, 0, &bmp);
- }
- //_fmemset(MK_FP(0xA000, 0), (int)p->plane, SCREEN_WIDTH*(SCREEN_HEIGHT*2));
- modexDrawBmp(&page, 0, 0, &bmp);
- while(!kbhit())
- {
- //DrawPBuf(&page, 0, 0, p, 0);
- }
- modexLeave();
-
- printf("\n%d\n", sizeof(p->plane));
- printf("%d\n", sizeof(bmp));
-
- for(i=0; i<(320*240); i++)
- {
- fprintf(stdout, "%d", bmp.data[i]);
- if(i%320==0) fprintf(stdout, "\n");
+ //for(i=0; i<100 ;i++) {
+//0000 modexDrawSprite(&gvar.video.page[0], 20, 20, PCXBMPPTR);
+ modexDrawSprite(&(gvar.video.page[0]), 160, 120, PCXBMPPTR);
+ modexDrawBmp(&gvar.video.page[0], 0, 128, PCXBMPPTR);
+ //}
+ t2 = (*clockw-start)/18.2;
+ //_fmemset(MK_FP(0xA000, 0), (int)p->plane, gvar.video.page[0].sw*(gvar.video.page[0].sh*2));
+ //modexDrawBmp(&gvar.video.page[0], 0, 0, PCXBMPPTR);
+ while(!kbhit())
+ {
+ //DrawPBuf(&gvar.video.page[0], 0, 0, p, 0);
}
+ VGAmodeX(0, 1, &gvar);
+ /*printf("\nmain=%Fp\n\n", &i);
+ printf("PCXBMP.data=%Fp\n", PCXBMP.data);
+ printf("*PCXBMP.data=%Fp\n", *(PCXBMP.data));
+ printf("PCXBMPPTR.data=%Fp\n", &(PCXBMP.data));
+
+ printf("\n%d\n", sizeof(p->plane));
+ printf("%d\n", sizeof(PCXBMP));*/
+
+ /*for(i=0; i<(320*240); i++)
+ {
+ fprintf(stdout, "%d", PCXBMP.data[i]);
+ if(i%PCXBMP.width==0) fprintf(stdout, "\n");
+ }*/
printf("CPU to VGA: %f\n", t1);
printf("VGA to VGA: %f\n", t2);
+ printf("gvar.video.page[0].width: %u\n", gvar.video.page[0].width);
+ printf("gvar.video.page[0].height: %u\n", gvar.video.page[0].height);
return;
}