X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fmodex16.c;h=2d4c00242676ffd4401578c3fb6f024599199c21;hb=e3b220f5349f8282bd426fdca00c64c8c7e831cd;hp=247a24d34f1500392357014bd26fb34d4a9a25e5;hpb=e9292f41f721bb096d78a2abe35020c045ebc749;p=16.git diff --git a/src/lib/modex16.c b/src/lib/modex16.c index 247a24d3..2d4c0024 100755 --- a/src/lib/modex16.c +++ b/src/lib/modex16.c @@ -80,7 +80,6 @@ vgaGetMode() void modexEnter(sword vq, boolean cmem, global_game_variables_t *gv) { word i; - dword far*ptr=(dword far*)vga_state.vga_graphics_ram;//VGA; /* used for faster screen clearing */ struct vga_mode_params cm; int CRTParmCount; @@ -93,10 +92,19 @@ void modexEnter(sword vq, boolean cmem, global_game_variables_t *gv) { case 1: //CRTParmCount = sizeof(ModeX_320x240regs) / sizeof(ModeX_320x240regs[0]); + /*for(i=0; ivideo.page[0].sw=vga_state.vga_width = 320; // VGA lib currently does not update this - gv->video.page[0].sh=vga_state.vga_height = 240; // VGA lib currently does not update this - + gv->video.page[0].sw = vga_state.vga_width = 320; // VGA lib currently does not update this + gv->video.page[0].sh = vga_state.vga_height = 240; // VGA lib currently does not update this + /* virtual width and height. match screen, at first */ + gv->video.page[0].height = gv->video.page[0].sh; + gv->video.page[0].width = gv->video.page[0].sw; + + // mode X BYTE mode + cm.word_mode = 0; + cm.dword_mode = 0; // 320x240 mode 60Hz cm.horizontal_total=0x5f + 5; /* CRTC[0] -5 */ cm.horizontal_display_end=0x4f + 1; /* CRTC[1] -1 */ @@ -115,8 +123,7 @@ void modexEnter(sword vq, boolean cmem, global_game_variables_t *gv) cm.clock_select = 0; /* misc register = 0xE3 25MHz */ cm.vsync_neg = 1; cm.hsync_neg = 1; - vga_state.vga_stride=0x58; - cm.offset=0x2c; + cm.offset = (vga_state.vga_width / (4 * 2)); // 320 wide (40 x 4 pixel groups x 2) break; case 2: // TODO: 160x120 according to ModeX_160x120regs return; @@ -130,28 +137,32 @@ void modexEnter(sword vq, boolean cmem, global_game_variables_t *gv) return; } + vga_state.vga_stride = cm.offset * 2; vga_write_crtc_mode(&cm,0); /* clear video memory */ switch (cmem) { - case 1: - /* clear video memory */ - vga_write_sequencer(2/*map mask register*/,0xf/*all 4 planes*/); - for(i=0; i<0x8000; i++) ptr[i] = 0x0000; + case 1: { + /* clear video memory */ + dword far*ptr=(dword far*)vga_state.vga_graphics_ram;//VGA; /* used for faster screen clearing */ + vga_write_sequencer(2/*map mask register*/,0xf/*all 4 planes*/); + for(i = 0;i < 0x4000; i++) ptr[i] = 0x0000; // 0x4000 x dword = 64KB + } break; } - gv->video.page[0].tilesw = gv->video.page[0].sw/TILEWH; - gv->video.page[0].tilesh = gv->video.page[0].sh/TILEWH; + +// gv->video.page[0].tw = gv->video.page[0].sw/TILEWH; +// gv->video.page[0].th = gv->video.page[0].sh/TILEWH; + //TODO MAKE FLEXIBLE~ - gv->video.page[0].tilemidposscreenx = gv->video.page[0].tilesw; - gv->video.page[0].tilemidposscreeny = (gv->video.page[0].tilesh/2)+1; - #define PAGE_SIZE (word)(gv->video.page[0].sw/4 * gv->video.page[0].sh) +// gv->video.page[0].tilemidposscreenx = gv->video.page[0].tilesw; +// gv->video.page[0].tilemidposscreeny = (gv->video.page[0].tilesh/2)+1; } void modexLeave() { - /* TODO restore original mode and palette */ + /* VGAmodeX restores original mode and palette */ vgaSetMode(TEXT_MODE); } @@ -161,20 +172,22 @@ modexDefaultPage(page_t *p) page_t page; /* default page values */ - page.data = vga_state.vga_graphics_ram;//VGA; + //page.data = VGA; + //page.data = (byte far *)(vga_state.vga_graphics_ram); + page.data = (vga_state.vga_graphics_ram); page.dx = 0; page.dy = 0; page.sw = p->sw; page.sh = p->sh; - page.width = p->sw; - page.height = p->sh; + page.width = p->sw+TILEWHD; + page.height = p->sh+TILEWHD; page.tw = page.sw/TILEWH; page.th = page.sh/TILEWH; + page.tilesw=page.width/TILEWH; + page.tilesh=page.height/TILEWH; page.tilemidposscreenx = page.tw/2; page.tilemidposscreeny = (page.th/2)+1; - page.tilesw=p->tilesw; - page.tilesh=p->tilesh; - //pageSize = p->sw*p->sh; + page.pagesize = (sdiword)(page.width/4)*page.height; page.id = 0; return page; @@ -187,17 +200,19 @@ page_t modexNextPage(page_t *p) { page_t result; - result.data = p->data + (p->width/4)*p->height; + result.data = p->data + (p->pagesize); result.dx = 0; result.dy = 0; result.width = p->width; result.height = p->height; - result.tw = p->width/TILEWH; - result.th = p->height/TILEWH; + result.tw = p->tw; + result.th = p->th; + result.tilesw = p->tilesw; + result.tilesh = p->tilesh; result.id = p->id+1; + result.pagesize = p->pagesize; return result; -// return modexNextPageFlexibleSize(&p, p->width, p->height); } //next page with defined dimentions~ @@ -206,18 +221,45 @@ modexNextPageFlexibleSize(page_t *p, word x, word y) { page_t result; - result.data = p->data + (p->width/4)*p->height; /* compute the offset */ + result.data = p->data + (p->pagesize); /* compute the offset */ result.dx = 0; result.dy = 0; result.width = x; result.height = y; - result.tw = p->width/TILEWH; - result.th = p->height/TILEWH; + result.tw = result.sw/TILEWH; + result.th = result.sh/TILEWH; + result.tilesw=result.width/TILEWH; + result.tilesh=result.height/TILEWH; result.id = p->id+1; + result.pagesize = (sdiword)(result.width/4)*result.height; return result; } +void modexCalcVmemRemain(video_t *video) +{ + byte i; + //printf("\n\n 1st vmem_remain=%ld\n", video->vmem_remain); + for(i=0; i<=video->num_of_pages-1; i++) + { + video->vmem_remain-=video->page[i].pagesize; + //printf(" [%u], video->page[i].pagesize=%ld\n", i, video->page[i].pagesize); + //printf(" [%u], vmem_remain=%ld\n", i, video->vmem_remain); + } +} + +void modexHiganbanaPageSetup(video_t *video) +{ + video->vmem_remain=262144L; + video->num_of_pages=0; + (video->page[0]) = modexDefaultPage(&(video->page[0])); video->num_of_pages++; + //video->page[0].width += (TILEWHD); video->page[0].height += (TILEWHD); + (video->page[1]) = modexNextPage(&(video->page[0])); video->num_of_pages++; + //(video->page[2]) = modexNextPageFlexibleSize(&(video->page[1]), video->page[0].width, video->page[0].sh-40); video->num_of_pages++; + //(video->page[3]) = modexNextPageFlexibleSize(&(video->page[2]), TILEWH, TILEWH); video->num_of_pages++; + modexCalcVmemRemain(video); + video->p=0; +} void modexShowPage(page_t *page) { @@ -252,21 +294,18 @@ modexShowPage(page_t *page) { outp(AC_INDEX, (page->dx & 0x03) << 1); } - void modexPanPage(page_t *page, int dx, int dy) { page->dx = dx; page->dy = dy; } - void modexSelectPlane(byte plane) { outp(SC_INDEX, MAP_MASK); /* select plane */ outp(SC_DATA, plane); } - void modexClearRegion(page_t *page, int x, int y, int w, int h, byte color) { word pageOff = (word) page->data; @@ -285,6 +324,14 @@ modexClearRegion(page_t *page, int x, int y, int w, int h, byte color) { } __asm { + PUSHF + PUSH ES + PUSH AX + PUSH BX + PUSH CX + PUSH DX + PUSH SI + PUSH DI MOV AX, SCREEN_SEG ; go to the VGA memory MOV ES, AX MOV DI, poffset ; go to the first pixel @@ -318,6 +365,14 @@ modexClearRegion(page_t *page, int x, int y, int w, int h, byte color) { ADD DI, nextRow ; go to the next row DEC h JNZ SCAN_START + POP DI + POP SI + POP DX + POP CX + POP BX + POP AX + POP ES + POPF } } @@ -335,7 +390,7 @@ modexCopyPageRegion(page_t *dest, page_t *src, { word doffset = (word)dest->data + dy*(dest->width/4) + dx/4; word soffset = (word)src->data + sy*(src->width/4) + sx/4; - word scans = width/4; + word scans = vga_state.vga_stride; word nextSrcRow = src->width/4 - scans - 1; word nextDestRow = dest->width/4 - scans - 1; byte lclip[] = {0x0f, 0x0e, 0x0c, 0x08}; /* clips for rectangles not on 4s */ @@ -344,6 +399,15 @@ modexCopyPageRegion(page_t *dest, page_t *src, byte right = rclip[(sx+width)&0x03]; __asm { + PUSHF + PUSH ES + PUSH AX + PUSH BX + PUSH CX + PUSH DX + PUSH SI + PUSH DI + MOV AX, SCREEN_SEG ; work in the vga space MOV ES, AX ; MOV DI, doffset ; @@ -392,6 +456,15 @@ modexCopyPageRegion(page_t *dest, page_t *src, MOV DX, GC_INDEX+1 ; go back to CPU data MOV AL, 0ffh ; none from latches OUT DX, AL ; + + POP DI + POP SI + POP DX + POP CX + POP BX + POP AX + POP ES + POPF } } @@ -873,10 +946,13 @@ byte modexgetPixel(page_t *page, int x, int y) } -void modexprint(page_t *page, word x, word y, word t, word col, word bgcol, const byte *str, word addrq, boolean q) +void modexprint(page_t *page, word x, word y, word t, word col, word bgcol, const byte *str) { word s, o, w; + word x_draw = x; word addr = (word) romFontsData.l; + word addrq = (page->width/4) * y + (x / 4) + ((word)page->data); + word addrr = addrq; byte c; s=romFonts[t].seg; @@ -887,35 +963,23 @@ void modexprint(page_t *page, word x, word y, word t, word col, word bgcol, cons for(; *str != '\0'; str++) { c = (*str); - if((c=='\n'/* || c=="\ -"*/) || romFontsData.chw ->=page->width) + if(c=='\n') { - romFontsData.chw=0; - y+=romFonts[t].charSize; + x = x_draw; + romFontsData.chw = 0; + addrq += (page->width / 4) * 8; + addrr = addrq; + y += 8; continue; } - //load the letter 'A' - __asm { - MOV DI, addr - MOV SI, o - MOV ES, s - SUB AH, AH - MOV AL, c ; the letter - MOV CX, w - MUL CX - ADD SI, AX ;the address of charcter - L1: MOV AX, ES:SI - MOV DS:DI, AX - INC SI - INC DI - DEC CX - JNZ L1 - } -//TODO: OPTIMIZE THIS!!!! - modexDrawCharPBuf(page, x, y, t, col, bgcol, addrq, q); - //if(!q) getch(); + // load the character into romFontsData.l + // no need for inline assembly! + // NTS: It might even be faster to just let the modexDrawChar point directly at ROM font than to copy per char! --J.C. + _fmemcpy(romFontsData.l,MK_FP(s,o+(w*c))/*ROM font location*/,w/*char size*/); + modexDrawChar(page, x_draw/*for mode X planar use*/, t, col, bgcol, addrr); + x_draw += 8; /* track X for edge of screen */ + addrr += 2; /* move 8 pixels over (2 x 4 planar pixels per byte) */ } } @@ -962,6 +1026,15 @@ void modexprintbig(page_t *page, word x, word y, word t, word col, word bgcol, c } //load the letter 'A' __asm { + PUSHF + PUSH ES + PUSH AX + PUSH BX + PUSH CX + PUSH DX + PUSH SI + PUSH DI + MOV DI, addr MOV SI, o MOV ES, s @@ -976,6 +1049,15 @@ void modexprintbig(page_t *page, word x, word y, word t, word col, word bgcol, c INC DI DEC CX JNZ L1 + + POP DI + POP SI + POP DX + POP CX + POP BX + POP AX + POP ES + POPF } for(i=0; iwidth*(page->height)/4); } -/*void +void modexWaitBorder() { while(inp(INPUT_STATUS_1) & 8) { // spin @@ -1033,7 +1115,7 @@ modexWaitBorder() { while(!(inp(INPUT_STATUS_1) & 8)) { // spin } -}*/ +} void bios_cls() { VGA_ALPHA_PTR ap;