octospacc/MultiSpaccSDK
1
0
Fork 0
mirror of https://gitlab.com/octospacc/MultiSpaccSDK synced 2025-06-05 22:09:21 +02:00
Code Issues Projects Releases Wiki Activity

Add NES sprite flags, handle SDL non-held inputs

Browse Source
This commit is contained in:
OctoSpacc
2023-11-19 01:34:57 +01:00
parent 3ba1e58b75
commit 399e7426b5
11 changed files with 237 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
LibMultiSpacc/Examples/CHARS.xcf
View File

Binary file not shown.

15
LibMultiSpacc/Examples/HelloWorld/HelloWorld.c
View File

@ -13,23 +13,21 @@ typedef struct MainArgs {
MultiSpacc_Surface *background;
//MultiSpacc_Surface *Foreground;
MultiSpacc_Surface *tilesImg;
MultiSpacc_KeysStates *buttonsStates;
} MainArgs;
/*{pal:"nes",layout:"nes"}*/
const char palette[32] = {
0x0F, // screen
0x11,0x02,0x02,0x00, // background 0
0x00,0x00,0x00,0x00, // background 1
0x00,0x00,0x00,0x00, // background 2
0x00,0x00,0x00,0x00, // background 3
0x16,0x00,0x00,0x00, // sprite 0
0x28,0x00,0x00,0x00, // sprite 0
0x00,0x00,0x00,0x00, // sprite 1
0x00,0x00,0x00,0x00, // sprite 2
0x00,0x00,0x00, // sprite 3
};
Uint32 nextTick;
bool MainLoop( void *args )
{
MainArgs *margs = (MainArgs*)args;
@ -37,7 +35,7 @@ bool MainLoop( void *args )
//SDL_FillRect(margs->background, NULL, 0x00F);
MultiSpacc_BlitLayer( margs->background, margs->screen );
//SDL_BlitSurface( margs->Foreground, &rect, margs->Screen, &rect );
MultiSpacc_SetSprite( 0, margs->spriteX, margs->spriteY, 1, margs->tilesImg, margs->screen );
MultiSpacc_SetSprite( 0, margs->spriteX, margs->spriteY, 1, NULL, margs->tilesImg, margs->screen );
//scroll(spriteX,0);
margs->spriteX += margs->accelX;
@ -52,8 +50,10 @@ bool MainLoop( void *args )
margs->accelY *= -1;
}
MultiSpacc_PollButtons( 0, margs->buttonsStates );
/* TODO: listen for OS terminate signal */
if( MultiSpacc_CheckKey( MultiSpacc_Key_Pause, 0 ) )
if( MultiSpacc_CheckKeyPress( MultiSpacc_Key_Pause, margs->buttonsStates ) )
{
return false;
}
@ -77,14 +77,15 @@ int main( int argc, char *argv[] )
{
MainArgs margs = {0};
MultiSpacc_SurfaceConfig windowConfig = {0};
MultiSpacc_KeysStates buttonsStates = {0};
margs.windowConfig = &windowConfig;
margs.buttonsStates = &buttonsStates;
margs.accelX = +2;
margs.accelY = +2;
windowConfig.width = 320;
windowConfig.height = 240;
//windowConfig.bits = 16;
memcpy( windowConfig.palette, palette, 32 );
//romfsInit();

1
LibMultiSpacc/Examples/Makefile
View File

@ -9,6 +9,7 @@ All all:
"Target=WindowsPC MultiSpacc_Target=SDL20" \
"Target=Windows9x" \
"Target=Web" \
"Target=Switch" \
"Target=NDS" \
"Target=NES" \
; do \

66
LibMultiSpacc/Examples/Pong/Pong.c
View File

@ -20,13 +20,14 @@ signed char paddleDxMove = 0;
//char scoreChar[6];
MultiSpacc_KeysStates buttonsStates;
MultiSpacc_SurfaceConfig windowConfig = {0};
MultiSpacc_Window *window;
MultiSpacc_Surface *screen;
MultiSpacc_Surface *background;
MultiSpacc_Surface *tilesImg;
MultiSpacc_SpritesMap paddleSpriteMap;
MultiSpacc_SpritesMap paddleSxSpriteMap, paddleDxSpriteMap;
MultiSpacc_TilesMap divisorTileMap, borderTileMap;
#define BallSize 8
@ -36,8 +37,9 @@ MultiSpacc_TilesMap divisorTileMap, borderTileMap;
#define BallTile 128
#define PaddleTile 129
#define DivisorTile 130
#define BorderTile 131
#define BorderTile 130
#define DivisorTileSx 131
#define DivisorTileDx 132
#define BallSprite 0
#define PaddleSxSprite 1
@ -54,15 +56,15 @@ MultiSpacc_TilesMap divisorTileMap, borderTileMap;
// TODO: more defines for frequently-used expressions
const char palette[32] = {
0x0F, // screen
0x11,0x30,0x27,0x00, // background 0
0x1c,0x20,0x2c,0x00, // background 1
0x00,0x10,0x20,0x00, // background 2
0x06,0x16,0x26,0x00, // background 3
0x16,0x35,0x24,0x00, // sprite 0
0x00,0x37,0x25,0x00, // sprite 1
0x0d,0x2d,0x3a,0x00, // sprite 2
0x0d,0x27,0x2a, // sprite 3
0x1B, // screen
0x30,0x20,0x20,0x20, // background 0
0x00,0x00,0x00,0x00, // background 1
0x00,0x00,0x00,0x00, // background 2
0x00,0x00,0x00,0x00, // background 3
0x30,0x20,0x20,0x20, // sprite 0
0x00,0x00,0x00,0x00, // sprite 1
0x00,0x00,0x00,0x00, // sprite 2
0x00,0x00,0x00, // sprite 3
};
void ResetBall(void)
@ -163,11 +165,11 @@ void UpdateCpuPlayer(void)
bool PollPlayerPaddle(void)
{
if( paddleSxY > 0+ScreenMarginYPx+PaddleMarginYPx+BallSize && MultiSpacc_CheckKey( MultiSpacc_Key_Up, 0 ) )
if( paddleSxY > 0+ScreenMarginYPx+PaddleMarginYPx+BallSize && MultiSpacc_CheckKeyHold( MultiSpacc_Key_Up, &buttonsStates ) )
{
paddleSxMove = -1;
}
else if( paddleSxY < windowConfig.height-ScreenMarginYPx-PaddleMarginYPx-PaddleHeightPx-BallSize && MultiSpacc_CheckKey( MultiSpacc_Key_Down, 0 ) )
else if( paddleSxY < windowConfig.height-ScreenMarginYPx-PaddleMarginYPx-PaddleHeightPx-BallSize && MultiSpacc_CheckKeyHold( MultiSpacc_Key_Down, &buttonsStates ) )
{
paddleSxMove = +1;
}
@ -193,8 +195,8 @@ bool DisplayBorders(void)
for( i=1; i<(windowConfig.height/8 - 1); i++ )
{
MultiSpacc_SetTile( windowConfig.width/8/2 , i, DivisorTile, tilesImg, background );
MultiSpacc_SetTile( windowConfig.width/8/2 - 1, i, DivisorTile, tilesImg, background );
MultiSpacc_SetTile( windowConfig.width/8/2 , i, DivisorTileDx, tilesImg, background );
MultiSpacc_SetTile( windowConfig.width/8/2 - 1, i, DivisorTileSx, tilesImg, background );
}
for( i=0; i<windowConfig.width/8; i++ )
@ -206,18 +208,20 @@ bool DisplayBorders(void)
bool RealUpdate( void *args, double deltaTime )
{
MultiSpacc_PollButtons( 0, &buttonsStates );
if(!paused)
{
//SDL_FillRect( background, &background->clip_rect, SDL_MapRGB( background->format, 0, 0, 0 ) );
MultiSpacc_BlitLayer( background, screen );
MultiSpacc_SetSprite( BallSprite, ballX+accelX*deltaTime, ballY+accelY*deltaTime, BallTile, tilesImg, screen );
MultiSpacc_SetSprite( BallSprite, ballX+accelX*deltaTime, ballY+accelY*deltaTime, BallTile, NULL, tilesImg, screen );
#define PaddleAccelDelta PaddleAccel*deltaTime
#define PaddleSxYDisplay (paddleSxY + paddleSxMove*PaddleAccelDelta)
#define PaddleDxYDisplay (paddleDxY + paddleDxMove*PaddleAccelDelta)
MultiSpacc_SetMetaSprite( PaddleSxSprite, PaddleSxX, PaddleSxYDisplay, &paddleSpriteMap, PaddleHeightTl, tilesImg, screen );
MultiSpacc_SetMetaSprite( PaddleDxSprite, PaddleDxX, PaddleDxYDisplay, &paddleSpriteMap, PaddleHeightTl, tilesImg, screen );
MultiSpacc_SetMetaSprite( PaddleSxSprite, PaddleSxX, PaddleSxYDisplay, &paddleSxSpriteMap, PaddleHeightTl, tilesImg, screen );
MultiSpacc_SetMetaSprite( PaddleDxSprite, PaddleDxX, PaddleDxYDisplay, &paddleDxSpriteMap, PaddleHeightTl, tilesImg, screen );
//RefreshScore():
//itoa(scoreSx, scoreChar, 10);
@ -231,7 +235,7 @@ bool RealUpdate( void *args, double deltaTime )
// TODO: listen for OS terminate signal
// TODO: fix SDL not waiting for key release with inputs checked this way
// TODO: proper pause menu?
if( MultiSpacc_CheckKey( MultiSpacc_Key_Pause, 0 ) )
if( MultiSpacc_CheckKeyPress( MultiSpacc_Key_Pause, &buttonsStates ) )
{
if(!paused)
{
@ -257,17 +261,25 @@ bool RealUpdate( void *args, double deltaTime )
int main( int argc, char *argv[] )
{
int i;
int chr[] = { PaddleTile, PaddleTile, PaddleTile, PaddleTile };
int x[] = { 0, 0, 0, 0 };
int y[] = { 0, 8, 16, 24 };
paddleSpriteMap.chr = chr;
paddleSpriteMap.x = x;
paddleSpriteMap.y = y;
int x[PaddleHeightTl] = { 0, 0, 0, 0 };
int y[PaddleHeightTl] = { 0, 8, 16, 24 };
int chr[PaddleHeightTl] = { PaddleTile, PaddleTile, PaddleTile, PaddleTile };
MultiSpacc_SpriteFlags flagsSx[PaddleHeightTl];
MultiSpacc_SpriteFlags flagsDx[PaddleHeightTl];
for( i=0; i<PaddleHeightTl; ++i ){
flagsDx[i].flipHorizontal = true;
}
paddleSxSpriteMap.x = paddleDxSpriteMap.x = x;
paddleSxSpriteMap.y = paddleDxSpriteMap.y = y;
paddleSxSpriteMap.chr = paddleDxSpriteMap.chr = chr;
paddleSxSpriteMap.flags = (MultiSpacc_SpriteFlags*)&flagsSx;
paddleDxSpriteMap.flags = (MultiSpacc_SpriteFlags*)&flagsDx;
windowConfig.width = 320;
windowConfig.height = 240;
windowConfig.bits = 16;
memcpy( windowConfig.palette, palette, 32 );
window = MultiSpacc_SetWindow( &windowConfig );