X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fpcxtest.c;h=07a4795d487aac8355418a993378365fb7702030;hb=c13dbd65b6c7f673537cfa5ef6456b09444c1406;hp=e2c133cbc7f0ec79698e770541c2d6ff7b1d9871;hpb=f66b2c6a16e6f6c2c9c07a39d1855b5ea178fead;p=16.git
diff --git a/src/pcxtest.c b/src/pcxtest.c
old mode 100644
new mode 100755
index e2c133cb..07a4795d
--- a/src/pcxtest.c
+++ b/src/pcxtest.c
@@ -1,79 +1,136 @@
+/* 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 "src\lib\modex16.h"
-#include "src\lib\bitmap.h"
+#include
+#include
+#include "src/lib/modex16.h"
+#include "src/lib/bitmap.h"
+#include "src/lib/planar.h"
-word far* clock= (word far*) 0x046C; /* 18.2hz clock */
+word far* clockw= (word far*) 0x046C; /* 18.2hz clock */
+/*
void
-oldDrawBmp(byte far* page, int x, int y, bitmap_t *bmp, byte sprite) {
- byte plane;
- word px, py;
- word offset;
-
- /* TODO Make this fast. It's SLOOOOOOW */
- for(plane=0; plane < 4; plane++) {
+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 < bmp->width; px+=4) {
- offset=px;
- for(py=0; pyheight; py++) {
- if(!sprite || bmp->data[offset])
- page[PAGE_OFFSET(x+px, y+py)] = bmp->data[offset];
- offset+=bmp->width;
- }
+ 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++;
+ }
+ }
}
- }
}
+*/
void main() {
- bitmap_t bmp;
- int i;
- page_t page;
- word start;
- float t1, t2;
-
- page=modexDefaultPage();
-
- bmp = bitmapLoadPcx("data\46113319.pcx");
- modexEnter();
-
- /* fix up the palette and everything */
- modexPalUpdate(bmp.palette);
-
- /* clear and draw one sprite and one bitmap */
- modexClearRegion(&page, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 1);
-
- /* non sprite comparison */
- start = *clock;
- for(i=0; i<100 ;i++) {
- oldDrawBmp(VGA, 20, 20, &bmp, 0);
- }
-
- start = *clock;
- for(i=0; i<100 ;i++) {
- modexDrawBmp(&page, 20, 20, &bmp);
- }
- t1 = (*clock-start) /18.2;
-
- start = *clock;
- for(i=0; i<100; i++) {
- modexCopyPageRegion(&page, &page, 20, 20, 128, 20, 64, 64);
- }
- t2 = (*clock-start)/18.2;
-
-
- start = *clock;
- for(i=0; i<100 ;i++) {
- oldDrawBmp(VGA, 20, 20, &bmp, 1);
- }
-
-
- start = *clock;
- for(i=0; i<100 ;i++) {
- modexDrawSprite(&page, 20, 20, &bmp);
- }
- modexLeave();
-
- printf("CPU to VGA: %f\n", t1);
- printf("VGA to VGA: %f\n", t2);
- return;
+ bitmap_t bmp;
+ planar_buf_t *p;
+ int i;
+ page_t page;
+ word start;
+ int plane;
+ float t1, t2;
+
+ page=modexDefaultPage();
+
+//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();
+
+ /* fix up the palette and everything */
+ modexPalUpdate1(bmp.palette);
+
+ /* clear and draw one sprite and one bitmap */
+ modexClearRegion(&page, 0, 0, SCREEN_WIDTH, SCREEN_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++) {
+//0000 modexDrawBmp(&page, 20, 20, &bmp);
+ modexDrawBmp(&page, 160, 120, &bmp);
+ //}
+ 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;
+
+
+ start = *clockw;
+ //for(i=0; i<100 ;i++) {
+ oldDrawBmp(VGA, 20, 20, &bmp, 1);
+ //}
+
+
+ start = *clockw;
+ //for(i=0; i<100 ;i++) {
+//0000 modexDrawSprite(&page, 20, 20, &bmp);
+ modexDrawSprite(&page, 160, 120, &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("\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("\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%bmp.width==0) fprintf(stdout, "\n");
+ }*/
+ printf("CPU to VGA: %f\n", t1);
+ printf("VGA to VGA: %f\n", t2);
+ return;
}