X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fpcxtest.c;h=07e8dfd5df7ba370dee79bbe1d8c97dc8680aca8;hb=27341929f20173735232f3af6fe88a6176e2f7e6;hp=1c80dce78cd3fb318bb6c30c55a7e53c36df921d;hpb=c3104b1494bd0f31ce49e3365d36e4ace02e69c7;p=proj16%2F16.git diff --git a/src/pcxtest.c b/src/pcxtest.c index 1c80dce7..07e8dfd5 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-2021 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * @@ -23,116 +23,119 @@ #include #include #include -#include "src/lib/modex16.h" +#include "src/lib/16_vl.h" #include "src/lib/bitmap.h" -#include "src/lib/planar.h" - -global_game_variables_t gvar; - -/* -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 "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; + 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(); -//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); - VGAmodeX(1, &gvar); + // 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); + + 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; + /*start = *clockw; //for(i=0; i<100 ;i++) { - oldDrawBmp(VGA, 20, 20, &bmp, 0); + oldDrawBmp(VGA, 0, 0, PCXBMPPTR, 0); //} start = *clockw; //for(i=0; i<100 ;i++) { -//0000 modexDrawBmp(&page, 20, 20, &bmp); - modexDrawBmp(&page, 160, 120, &bmp); +//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); +//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; + t2 = (*clockw-start)/18.2;*/ start = *clockw; //for(i=0; i<100 ;i++) { - oldDrawBmp(VGA, 20, 20, &bmp, 1); + 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, 160, 120, &bmp); +//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); //} - //_fmemset(MK_FP(0xA000, 0), (int)p->plane, SCREEN_WIDTH*(SCREEN_HEIGHT*2)); - //modexDrawBmp(&page, 0, 0, &bmp); + 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); } - VGAmodeX(0, &gvar); + VGAmodeX(0, 1, &gvar); /*printf("\nmain=%Fp\n\n", &i); - printf("bmp.data=%Fp\n", bmp.data); - printf("*bmp.data=%Fp\n", *(bmp.data)); - printf("&bmp.data=%Fp\n", &(bmp.data)); + 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++) { - fprintf(stdout, "%d", bmp.data[i]); - if(i%bmp.width==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("page.width: %u\n", page.width); - printf("page.height: %u\n", page.height); + 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; }