X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fscroll.c;h=65929b5a9bca125bb8a076b16a0ecef6929f3839;hb=077782026074116470d9637507d988ffcc29ef58;hp=2164ca4c897d9d8ab20eb7278216409feaa1c2ff;hpb=9c2785d66d34bd7ce81a2c85d4be3a6872609577;p=16.git diff --git a/src/scroll.c b/src/scroll.c index 2164ca4c..65929b5a 100644 --- a/src/scroll.c +++ b/src/scroll.c @@ -1,7 +1,29 @@ +/* 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 "src/lib/dos_kb.h" #include "src/lib/mapread.h" -#include "src/lib/wtest/wtest.c" -#include "src/lib/planar.c" +#include "src/lib/wcpu/wcpu.h" +#include "src/lib/planar.h" //====#include "src\lib\ems.c" //word far *clock= (word far*) 0x046C; /* 18.2hz clock */ @@ -30,21 +52,26 @@ typedef struct { word d; //direction bitmap_t data; //supposively the sprite sheet data int hp; //hitpoints of the player -} actor_t; +} actor_t; + +typedef struct +{ + map_view_t *mv; +} map_view_db_t; map_t allocMap(int w, int h); void initMap(map_t *map); -void mapScrollRight(map_view_t *mv, byte offset); -void mapScrollLeft(map_view_t *mv, byte offest); -void mapScrollUp(map_view_t *mv, byte offset); -void mapScrollDown(map_view_t *mv, byte offset); +void mapScrollRight(map_view_t *mv, byte offset, word id); +void mapScrollLeft(map_view_t *mv, byte offest, word id); +void mapScrollUp(map_view_t *mv, byte offset, word id); +void mapScrollDown(map_view_t *mv, byte offset, word id); void mapGoTo(map_view_t *mv, int tx, int ty); void mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y); void mapDrawRow(map_view_t *mv, int tx, int ty, word y); void mapDrawCol(map_view_t *mv, int tx, int ty, word x); void qclean(); void pdump(map_view_t *pee); -void animatePlayer(map_view_t *src, map_view_t *dest, /*map_view_t *top, */sword d, short scrolloffsetswitch, int x, int y, int ls, int lp, bitmap_t *bmp); +void animatePlayer(map_view_t *src, map_view_t *dest, /*map_view_t *top, */sword d, short scrolloffsetswitch, int x, int y, int ls, int lp, bitmap_t *bmp); #define TILEWH 16 #define QUADWH TILEWH/2 @@ -58,7 +85,7 @@ void animatePlayer(map_view_t *src, map_view_t *dest, /*map_view_t *top, */sword //#define TRIGGY 9 void main() { - size_t oldfreemem=GetFreeSize(); +//++++ size_t oldfreemem=GetFreeSize(); /*long emmhandle; long emsavail; char teststr[80];*/ @@ -71,8 +98,9 @@ void main() { static int persist_aniframe = 0; /* gonna be increased to 1 before being used, so 0 is ok for default */ page_t screen, screen2, screen3; map_t map; - map_view_t mv, mv2, mv3; - map_view_t *bg, *spri, *mask;//, *tmp; + map_view_t mv[3];//mv, mv2, mv3; + map_view_t *bg, *spri, *mask;//, *tmp; + //map_view_db_t pgid[4]; byte *dpal, *gpal; byte *ptr; byte *mappalptr; @@ -115,9 +143,9 @@ void main() { //---- map = allocMap(map.width,map.height); //20x15 is the resolution of the screen you can make maps smaller than 20x15 but the null space needs to be drawn properly //if(isEMS()) printf("%d tesuto\n", coretotalEMS()); //---- initMap(&map); - mv.map = ↦ - mv2.map = ↦ - mv3.map = ↦ + mv[0].map = ↦ + mv[1].map = ↦ + mv[2].map = ↦ /* draw the tiles */ ptr = map.data; @@ -178,7 +206,7 @@ void main() { //printf(" %d\n", sizeof(ptmp.data)); //printf("1: %d\n", paloffset); map.tiles->data->offset=(paloffset/3); - modexPalUpdate(map.tiles->data, &paloffset, 0, 0); + //XTmodexPalUpdate(map.tiles->data, &paloffset, 0, 0); printf("\n====\n"); printf("0 paloffset= %d\n", paloffset/3); printf("====\n\n"); @@ -190,18 +218,18 @@ void main() { /* setup camera and screen~ */ screen = modexDefaultPage(); screen.width += (TILEWH*2); - screen.height += (TILEWH*2)+QUADWH; - mv.page = &screen; - screen2 = modexNextPage(mv.page); - mv2.page = &screen2; - screen3 = modexNextPage0(mv2.page, 352, 176); //(352*176)+1024 is the remaining amount of memory left wwww + screen.height += (TILEWH*2);//+QUADWH; + mv[0].page = &screen; + screen2 = modexNextPage(mv[0].page); + mv[1].page = &screen2; + screen3 = modexNextPage0(mv[1].page, 320, 240); //(352*176)+1024 is the remaining amount of memory left wwww //screen3 = modexNextPage0(mv2.page, 320, 192); //(352*176)+1024 is the remaining amount of memory left wwww - mv3.page = &screen3; + mv[2].page = &screen3; /* set up paging */ - bg = &mv; - spri = &mv2; - mask = &mv3; + bg = &mv[0]; + spri = &mv[1]; + mask = &mv[2]; //TODO: LOAD map data and position the map in the middle of the screen if smaller then screen mapGoTo(bg, 0, 0); @@ -232,7 +260,8 @@ void main() { modexDrawSpriteRegion(spri->page, player.x-4, player.y-TILEWH, 24, 64, 24, 32, &ptmp); modexShowPage(spri->page); -// printf("Total used @ before loop: %zu\n", oldfreemem-GetFreeSize()); +// printf("Total used @ before loop: %zu\n", oldfreemem-GetFreeSize()); + modexClearRegion(mv[2].page, 0, 0, mv[2].page->width, mv[2].page->height, 1); modexFadeOn(4, gpal); while(!keyp(1) && player.hp>0) { @@ -255,9 +284,9 @@ void main() { { INC_PER_FRAME; //animatePlayer(bg, spri, mask, 1, 1, player.x, player.y, persist_aniframe, q, &ptmp); - animatePlayer(bg, spri, player.d-1, 1, player.x, player.y, persist_aniframe, player.q, &ptmp); - mapScrollRight(bg, SPEED); - mapScrollRight(spri, SPEED); + animatePlayer(bg, spri, player.d-1, 1, player.x, player.y, persist_aniframe, player.q, &ptmp); + mapScrollRight(mv, SPEED, 0); + mapScrollRight(mv, SPEED, 1); //mapScrollRight(mask, SPEED); modexShowPage(spri->page); player.q++; @@ -298,8 +327,8 @@ void main() { INC_PER_FRAME; //animatePlayer(bg, spri, mask, 3, 1, player.x, player.y, persist_aniframe, q, &ptmp); animatePlayer(bg, spri, player.d-1, 1, player.x, player.y, persist_aniframe, player.q, &ptmp); - mapScrollLeft(bg, SPEED); - mapScrollLeft(spri, SPEED); + mapScrollLeft(mv, SPEED, 0); + mapScrollLeft(mv, SPEED, 1); //mapScrollLeft(mask, SPEED); modexShowPage(spri->page); player.q++; @@ -339,9 +368,9 @@ void main() { { INC_PER_FRAME; //animatePlayer(bg, spri, mask, 2, 1, player.x, player.y, persist_aniframe, q, &ptmp); - animatePlayer(bg, spri, player.d-1, 1, player.x, player.y, persist_aniframe, player.q, &ptmp); - mapScrollDown(bg, SPEED); - mapScrollDown(spri, SPEED); + animatePlayer(bg, spri, player.d-1, 1, player.x, player.y, persist_aniframe, player.q, &ptmp); + mapScrollDown(mv, SPEED, 0); + mapScrollDown(mv, SPEED, 1); //mapScrollDown(mask, SPEED); modexShowPage(spri->page); player.q++; @@ -381,9 +410,9 @@ void main() { { INC_PER_FRAME; //animatePlayer(bg, spri, mask, 0, 1, player.x, player.y, persist_aniframe, q, &ptmp); - animatePlayer(bg, spri, player.d-1, 1, player.x, player.y, persist_aniframe, player.q, &ptmp); - mapScrollUp(bg, SPEED); - mapScrollUp(spri, SPEED); + animatePlayer(bg, spri, player.d-1, 1, player.x, player.y, persist_aniframe, player.q, &ptmp); + mapScrollUp(mv, SPEED, 0); + mapScrollUp(mv, SPEED, 1); //mapScrollUp(mask, SPEED); modexShowPage(spri->page); player.q++; @@ -586,8 +615,8 @@ void main() { printf("player.hp: %d", player.hp); printf(" player.q: %d", player.q); printf(" player.d: %d\n", player.d); printf("tile data value at player trigger position: %d\n", bg->map->data[(player.triggerx-1)+(map.width*(player.triggery-1))]); printf("palette offset: %d\n", paloffset/3); - printf("Total used: %zu\n", oldfreemem-GetFreeSize()); - printf("Total free: %zu\n", GetFreeSize()); +//++++ printf("Total used: %zu\n", oldfreemem-GetFreeSize()); +//++++ printf("Total free: %zu\n", GetFreeSize()); printf("temporary player sprite 0: http://www.pixiv.net/member_illust.php?mode=medium&illust_id=45556867\n"); printf("temporary player sprite 1: http://www.pixiv.net/member_illust.php?mode=medium&illust_id=44606385\n"); printf("Screen: %dx", screen.width); printf("%d\n", screen.height); @@ -698,98 +727,111 @@ initMap(map_t *map) { } //tile = tile ? 0 : 1; }*/ -} - +} + void -mapScrollRight(map_view_t *mv, byte offset) { +mapScrollRight(map_view_t *mv, byte offset, word id) +{ word x, y; /* coordinate for drawing */ /* increment the pixel position and update the page */ - mv->page->dx += offset; + mv[id].page->dx += offset; /* check to see if this changes the tile */ - if(mv->page->dx >= mv->dxThresh ) { + if(mv[id].page->dx >= mv[id].dxThresh ) { /* go forward one tile */ - mv->tx++; + mv[id].tx++; /* Snap the origin forward */ - mv->page->data += 4; - mv->page->dx = mv->map->tiles->tileWidth; - //} + mv[id].page->data += 4; + mv[id].page->dx = mv[id].map->tiles->tileWidth; /* draw the next column */ - x= SCREEN_WIDTH + mv->map->tiles->tileWidth; - mapDrawCol(mv, mv->tx + 20 , mv->ty-1, x); + x= SCREEN_WIDTH + mv[id].map->tiles->tileWidth; + if(id==0) + mapDrawCol(&mv[0], mv[0].tx + 20 , mv[0].ty-1, x); + else + modexCopyPageRegion(mv[id].page, mv[0].page, x, 0, x, 0, mv[id].map->tiles->tileWidth, mv[id].map->tiles->tileHeight*17); } } void -mapScrollLeft(map_view_t *mv, byte offset) { +mapScrollLeft(map_view_t *mv, byte offset, word id) +{ word x, y; /* coordinate for drawing */ /* increment the pixel position and update the page */ - mv->page->dx -= offset; + mv[id].page->dx -= offset; /* check to see if this changes the tile */ - if(mv->page->dx == 0) { + if(mv[id].page->dx == 0) { /* go backward one tile */ - mv->tx--; + mv[id].tx--; /* Snap the origin backward */ - mv->page->data -= 4; - mv->page->dx = mv->map->tiles->tileWidth; - //} - /* draw the next column */ - mapDrawCol(mv, mv->tx-1, mv->ty-1, 0); + mv[id].page->data -= 4; + mv[id].page->dx = mv[id].map->tiles->tileWidth; + + /* draw the next column */ + x= 0; + if(id==0) + mapDrawCol(&mv[0], mv[0].tx-1, mv[0].ty-1, 0); + else + modexCopyPageRegion(mv[id].page, mv[0].page, x, 0, x, 0, mv[id].map->tiles->tileWidth, mv[id].map->tiles->tileHeight*17); } } void -mapScrollUp(map_view_t *mv, byte offset) { +mapScrollUp(map_view_t *mv, byte offset, word id) +{ word x, y; /* coordinate for drawing */ /* increment the pixel position and update the page */ - mv->page->dy -= offset; + mv[id].page->dy -= offset; /* check to see if this changes the tile */ - if(mv->page->dy == 0 ) { + if(mv[id].page->dy == 0 ) { /* go down one tile */ - mv->ty--; + mv[id].ty--; /* Snap the origin downward */ - mv->page->data -= mv->page->width*4; - mv->page->dy = mv->map->tiles->tileHeight; - //} + mv[id].page->data -= mv[id].page->width*4; + mv[id].page->dy = mv[id].map->tiles->tileHeight; /* draw the next row */ y= 0; - mapDrawRow(mv, mv->tx-1 , mv->ty-1, y); + if(id==0) + mapDrawRow(&mv[0], mv[0].tx-1 , mv[0].ty-1, 0); + else + modexCopyPageRegion(mv[id].page, mv[0].page, 0, y, 0, y, mv[id].map->tiles->tileWidth*22, mv[id].map->tiles->tileHeight); } } void -mapScrollDown(map_view_t *mv, byte offset) { +mapScrollDown(map_view_t *mv, byte offset, word id) +{ word x, y; /* coordinate for drawing */ /* increment the pixel position and update the page */ - mv->page->dy += offset; + mv[id].page->dy += offset; /* check to see if this changes the tile */ - if(mv->page->dy >= mv->dyThresh ) { + if(mv[id].page->dy >= mv[id].dyThresh ) { /* go down one tile */ - mv->ty++; + mv[id].ty++; /* Snap the origin downward */ - mv->page->data += mv->page->width*4; - mv->page->dy = mv->map->tiles->tileHeight; - //} + mv[id].page->data += mv[id].page->width*4; + mv[id].page->dy = mv[id].map->tiles->tileHeight; /* draw the next row */ - y= SCREEN_HEIGHT + mv->map->tiles->tileHeight; - mapDrawRow(mv, mv->tx-1 , mv->ty+15, y); + y= SCREEN_HEIGHT + mv[id].map->tiles->tileHeight; + if(id==0) + mapDrawRow(&mv[0], mv[0].tx-1 , mv[0].ty+15, y); + else + modexCopyPageRegion(mv[id].page, mv[0].page, 0, y, 0, y, mv[id].map->tiles->tileWidth*22, mv[id].map->tiles->tileHeight); } - } @@ -935,5 +977,6 @@ animatePlayer(map_view_t *src, map_view_t *dest, /*map_view_t *top, */sword d, s //modexClearRegion(top->page, 66, 66, 2, 40, 0); //modexCopyPageRegion(dest->page, top->page, 66, 66, 66, 66, 2, 40); //turn this off if XT - if(detectcpu() > 0) modexWaitBorder(); + //XTif(detectcpu() > 0) + modexWaitBorder(); }