X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fpcxtest.c;h=9732cc28672c8a181fc5fcea366753906da02938;hb=82706f1175144599dd76e3a92cbc3d56f7f0d383;hp=d955fdc9858b0f9f20d7b35ccb5150532b3fe892;hpb=f1605e99959acfb32b36ae875601fc14dd670742;p=proj16%2F16.git diff --git a/src/pcxtest.c b/src/pcxtest.c index d955fdc9..9732cc28 100755 --- a/src/pcxtest.c +++ b/src/pcxtest.c @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669 + * Copyright (C) 2012-2022 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * @@ -23,110 +23,120 @@ #include #include #include -#include "src/lib/modex16.h" -#include "src/lib/bitmap.h" -#include "src/lib/planar.h" - -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 "16/modex16/bitmap.h" +//#include "16/modex16/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; + static global_game_variables_t gvar; +//---- planar_buf_t *p; word start; - int plane; 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"); +//0000 PCXBMP = bitmapLoadPcx("data/chikyuu.pcx"/*, &gvar*/); + PCXBMP = bitmapLoadPcx("data/maryai4a.pcx"); +// 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); + //--00 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); - } + /*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); + //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(&page, 0, 0, p, 0); + //DrawPBuf(&gvar.video.page[0], 0, 0, p, 0); } - modexLeave(); + 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(bmp)); + printf("%d\n", sizeof(PCXBMP));*/ - for(i=0; i<(320*240); i++) + /*for(i=0; i<(320*240); i++) { - fprintf(stdout, "%d", bmp.data[i]); - if(i%320==0) fprintf(stdout, "\n"); - } + 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; }