octospacc
/
MultiSpaccSDK
mirror of https://gitlab.com/octospacc/MultiSpaccSDK
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update pong, add metasprite function, various tests

This commit is contained in:
OctoSpacc 2023-11-09 19:26:53 +01:00
parent 92e6e2cdb9
commit 27c3bc089f
11 changed files with 138 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -3,7 +3,7 @@ image: debian:latest
before_script: |
apt update
apt install -y \
make gcc mingw-w64 wine wine32 cc65 emscripten curl p7zip-full python3 python3-pil \
make gcc mingw-w64 wine cc65 emscripten curl p7zip-full python3 python3-pil \
libsdl1.2-dev libsdl-image1.2-dev libsdl-ttf2.0-dev libsdl-mixer1.2-dev \
libsdl2-dev libsdl2-image-dev libsdl2-ttf-dev libsdl2-mixer-dev \
;

14
LibMultiSpacc/Examples/Common.mk
View File

@ -24,18 +24,18 @@ endif
ifeq ($(Target), LinuxPC)
ExeSuffix = .run
Defines += -DTarget_LinuxPC
Defines += -DTarget_LinuxPC -DMultiSpacc_Target_PC -DMultiSpacc_Target_Linux
MultiSpacc_Target = SDL20
else ifeq ($(Target), WindowsPC)
ExeSuffix = .exe
Defines += -DTarget_WindowsPC
Defines += -DTarget_WindowsPC -DMultiSpacc_Target_PC -DMultiSpacc_Target_Windows
MultiSpacc_Target = SDL20
ifneq ($(Host), Windows)
ToolsSuffix = -mingw-w64
endif
else ifeq ($(Target), Windows9x)
ExeSuffix = .exe
Defines += -DTarget_Windows9x
Defines += -DTarget_Windows9x -DMultiSpacc_Target_PC -DMultiSpacc_Target_Windows
MultiSpacc_Target = SDL12
LdFlags += -lmingw32 -static-libgcc
ifeq ($(Host), Windows)
@ -59,17 +59,17 @@ else ifeq ($(Target), NES)
endif
ifeq ($(MultiSpacc_Target), SDL12)
Defines += -DMultiSpacc_Target_SDL12 -DMultiSpacc_Target_SDLCom -DMultiSpacc_Target_SDLStandard
Defines += -DMultiSpacc_Target_SDL12 -DMultiSpacc_Target_SDLCom -DMultiSpacc_Target_SDLCommon -DMultiSpacc_Target_SDLStandard
CFlags += $(shell sdl-config --cflags)
LdFlags += $(shell sdl-config --libs) -lSDLmain -lSDL -lSDL_image -lSDL_mixer -lSDL_ttf
BuildProcess = __Normal__
else ifeq ($(MultiSpacc_Target), SDL20)
Defines += -DMultiSpacc_Target_SDL20 -DMultiSpacc_Target_SDLCom -DMultiSpacc_Target_SDLStandard
Defines += -DMultiSpacc_Target_SDL20 -DMultiSpacc_Target_SDLCom -DMultiSpacc_Target_SDLCommon -DMultiSpacc_Target_SDLStandard
CFlags += $(shell sdl2-config --cflags)
LdFlags += $(shell sdl2-config --libs) -lSDL2main -lSDL2 -lSDL2_image -lSDL2_mixer -lSDL2_ttf
BuildProcess = __Normal__
else ifeq ($(MultiSpacc_Target), Web)
Defines += -DMultiSpacc_Target_Web -DMultiSpacc_Target_SDL20 -DMultiSpacc_Target_SDLCom
Defines += -DMultiSpacc_Target_Web -DMultiSpacc_Target_SDL20 -DMultiSpacc_Target_SDLCom -DMultiSpacc_Target_SDLCommon -DMultiSpacc_Target_SDLWeb
LdFlags += -sWASM=1 -sUSE_SDL=2 -sUSE_SDL_IMAGE=2 -sSDL2_IMAGE_FORMATS='["png"]' -sUSE_SDL_TTF=2 -sUSE_SDL_MIXER=2
BuildProcess = __Web__
else ifeq ($(MultiSpacc_Target), NDS)
@ -99,7 +99,7 @@ __Web__:
cp ../Emscripten.html ./Build/Web/$(AppName).html
# TODO: bundle JS, WASM, and assets package in HTML file
# TODO: Fix include substitutions properly in non-standard build processes
# TODO: Fix include substitutions properly in non-standard build processes, and make all custom build processes lest wasteful
__NDS__:
$(eval VirtualBuildDir = ./Build/NDS)

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

@ -37,7 +37,7 @@ bool MainLoop( void *args )
//SDL_FillRect(margs->Background, &rect, 0x000000);
MultiSpacc_BlitLayer( margs->background, margs->screen );
//SDL_BlitSurface( margs->Foreground, &rect, margs->Screen, &rect );
MultiSpacc_Sprite( 0, margs->spriteX, margs->spriteY, 1, margs->tilesImg, margs->screen );
MultiSpacc_SetSprite( 0, margs->spriteX, margs->spriteY, 1, margs->tilesImg, margs->screen );
//scroll(spriteX,0);
margs->spriteX += margs->accelX;

0
LibMultiSpacc/Examples/Makefile Normal file
View File

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

@ -10,9 +10,8 @@ int ballY;
int accelX = 2;
int accelY = 2;
// the Y position of the paddles, measured from the top
int paddleSx;
int paddleDx;
int paddleSxY;
int paddleDxY;
MultiSpacc_SurfaceConfig windowConfig = {0};
MultiSpacc_Window *window;
@ -21,13 +20,18 @@ MultiSpacc_Surface *background;
MultiSpacc_Surface *tilesImg;
#define BallSize 8
#define PaddleWidth 8
#define PaddleHeight 4
#define TileBall 128
#define TilePaddle 129
#define BallTile 128
#define PaddleTile 129
#define SpriteBall 0
#define SpritePaddleSx 1
#define SpritePaddleDx 1+4
#define BallSprite 0
#define PaddleSxSprite 1
#define PaddleDxSprite 1 + PaddleHeight
#define PaddleSxX PaddleWidth
#define PaddleDxX windowConfig.width - 2*PaddleWidth
/*{pal:"nes",layout:"nes"}*/
const char palette[32] = {
@ -42,38 +46,80 @@ const char palette[32] = {
0x0d,0x27,0x2a, // sprite 3
};
const unsigned char paddleMetaSprite[] = {
0, 0, PaddleTile, 0,
0, 8, PaddleTile, 0,
0, 16, PaddleTile, 0,
0, 24, PaddleTile, 0,
128
};
bool MainLoop( void *args )
{
MultiSpacc_SpritesMap msdata;
int chr[] = { 129, 129, 129, 129 };
int x[] = { 0, 0, 0, 0 };
int y[] = { 0, 8, 16, 24 };
msdata.chr = chr;
msdata.x = x;
msdata.y = y;
if (!paused)
{
MultiSpacc_BlitLayer( background, screen );
MultiSpacc_Sprite( SpriteBall, ballX, ballY, TileBall, tilesImg, screen );
MultiSpacc_SetSprite( BallSprite, ballX, ballY, BallTile, tilesImg, screen );
// TODO: metasprites
MultiSpacc_SetMetaSprite( PaddleSxSprite, PaddleSxX, paddleSxY, &msdata, PaddleHeight, tilesImg, screen );
MultiSpacc_SetMetaSprite( PaddleDxSprite, PaddleDxX, paddleDxY, &msdata, PaddleHeight, tilesImg, screen );
MultiSpacc_Sprite( SpritePaddleSx , BallSize, paddleSx , TilePaddle, tilesImg, screen );
MultiSpacc_Sprite( SpritePaddleSx+1, BallSize, paddleSx + BallSize, TilePaddle, tilesImg, screen );
MultiSpacc_Sprite( SpritePaddleSx+2, BallSize, paddleSx + 2*BallSize, TilePaddle, tilesImg, screen );
MultiSpacc_Sprite( SpritePaddleSx+3, BallSize, paddleSx + 3*BallSize, TilePaddle, tilesImg, screen );
//oam_meta_spr( PaddleWidth, paddleSxY, 4, paddleMetaSprite );
//oam_meta_spr( windowConfig.width - 2*PaddleWidth, paddleDxY, 20, paddleMetaSprite );
MultiSpacc_Sprite( SpritePaddleDx , windowConfig.width - 2*BallSize, paddleDx , TilePaddle, tilesImg, screen );
MultiSpacc_Sprite( SpritePaddleDx+1, windowConfig.width - 2*BallSize, paddleDx + BallSize, TilePaddle, tilesImg, screen );
MultiSpacc_Sprite( SpritePaddleDx+2, windowConfig.width - 2*BallSize, paddleDx + 2*BallSize, TilePaddle, tilesImg, screen );
MultiSpacc_Sprite( SpritePaddleDx+3, windowConfig.width - 2*BallSize, paddleDx + 3*BallSize, TilePaddle, tilesImg, screen );
// MultiSpacc_Sprite( PaddleSxSprite , PaddleWidth, paddleSxY , PaddleTile, tilesImg, screen );
// MultiSpacc_Sprite( PaddleSxSprite+1, PaddleWidth, paddleSxY + PaddleWidth, PaddleTile, tilesImg, screen );
// MultiSpacc_Sprite( PaddleSxSprite+2, PaddleWidth, paddleSxY + 2*PaddleWidth, PaddleTile, tilesImg, screen );
// MultiSpacc_Sprite( PaddleSxSprite+3, PaddleWidth, paddleSxY + 3*PaddleWidth, PaddleTile, tilesImg, screen );
// MultiSpacc_Sprite( PaddleDxSprite , windowConfig.width - 2*PaddleWidth, paddleDxY , PaddleTile, tilesImg, screen );
// MultiSpacc_Sprite( PaddleDxSprite+1, windowConfig.width - 2*PaddleWidth, paddleDxY + PaddleWidth, PaddleTile, tilesImg, screen );
// MultiSpacc_Sprite( PaddleDxSprite+2, windowConfig.width - 2*PaddleWidth, paddleDxY + 2*PaddleWidth, PaddleTile, tilesImg, screen );
// MultiSpacc_Sprite( PaddleDxSprite+3, windowConfig.width - 2*PaddleWidth, paddleDxY + 3*PaddleWidth, PaddleTile, tilesImg, screen );
ballX += accelX;
ballY += accelY;
if( ballX == 0 || ballX == ( windowConfig.width - 8 ) )
if( ballX <= 0 || ballX >= (windowConfig.width - BallSize) )
{
accelX *= -1;
}
if( ballY == 0 || ballY == ( windowConfig.height - 8 ) )
if( ballY <= 0 || ballY >= (windowConfig.height - BallSize) )
{
accelY *= -1;
}
#define TouchingPaddleSx ( ballX <= PaddleSxX+BallSize && ballY >= paddleSxY-BallSize && ballY <= (paddleSxY + 8*PaddleHeight) )
#define TouchingPaddleDx ( ballX >= PaddleDxX-BallSize && ballY >= paddleDxY-BallSize && ballY <= (paddleDxY + 8*PaddleHeight) )
if( TouchingPaddleSx || TouchingPaddleDx )
{
accelX *= -1;
}
}
else
{
MultiSpacc_PrintText( "Pause", background, &windowConfig, 3, 3, tilesImg );
}
if( paddleSxY > 0 && MultiSpacc_CheckKey( MultiSpacc_Key_Up, 0 ) )
{
--paddleSxY;
}
else if( paddleSxY < (windowConfig.height - 8*PaddleHeight) && MultiSpacc_CheckKey( MultiSpacc_Key_Down, 0 ) )
{
++paddleSxY;
}
/* TODO: listen for OS terminate signal */
@ -121,8 +167,8 @@ int main( int argc, char *argv[] )
ballX = windowConfig.width/2;
ballY = windowConfig.height/2;
paddleSx = windowConfig.height/2 - 24;
paddleDx = windowConfig.height/2 - 24;
paddleSxY = windowConfig.height/2 - 24;
paddleDxY = windowConfig.height/2 - 24;
return MultiSpacc_SetMainLoop( MainLoop, NULL );
}

4
LibMultiSpacc/LibMultiSpacc/Keys.c
View File

@ -1,10 +1,10 @@
#include "./MultiSpacc.h"
bool MultiSpacc_CheckKey( char key, char pad )
bool MultiSpacc_CheckKey( int key, char pad )
{
#if defined(MultiSpacc_Target_SDLCom)
SDL_Event event;
while( SDL_PollEvent(&event) )
while( SDL_PollEvent(&event) ) // TODO: fix this, it eliminates all events beside the first
{
if ( event.type == SDL_KEYDOWN && event.key.keysym.sym == key )
{

25
LibMultiSpacc/LibMultiSpacc/Keys.h
View File

@ -21,21 +21,25 @@
#define MultiSpacc_Key_Start PAD_START
#endif
#if defined(MultiSpacc_Target_SDLCom)
#if defined(MultiSpacc_Target_SDLCommon) && (defined(MultiSpacc_Target_PC) || defined(MultiSpacc_Target_Web))
#define MultiSpacc_Key_Pause SDLK_ESCAPE
#elif defined(MultiSpacc_Target_NES)
#define MultiSpacc_Key_Pause PAD_START
#endif
#if defined(MultiSpacc_Target_NES)
#if defined(MultiSpacc_Target_SDLCommon) && (defined(MultiSpacc_Target_PC) || defined(MultiSpacc_Target_Web))
#define MultiSpacc_Key_Select SDLK_TAB
#elif defined(MultiSpacc_Target_NES)
#define MultiSpacc_Key_Select PAD_SELECT
#endif
#if defined(MultiSpacc_Target_SDLCom)
#if defined(MultiSpacc_Target_SDLCommon) && (defined(MultiSpacc_Target_PC) || defined(MultiSpacc_Target_Web))
#define MultiSpacc_Key_Up SDLK_UP
#define MultiSpacc_Key_Down SDLK_DOWN
#define MultiSpacc_Key_Left SDLK_LEFT
#define MultiSpacc_Key_Right SDLK_RIGHT
#elif defined(MultiSpacc_Target_NDS)
// ...
#elif defined(MultiSpacc_Target_NES)
#define MultiSpacc_Key_Up PAD_UP
#define MultiSpacc_Key_Down PAD_DOWN
@ -43,14 +47,13 @@
#define MultiSpacc_Key_Right PAD_RIGHT
#endif
// #if defined(MultiSpacc_Target_SDLCom)
// #define MultiSpacc_Key_Action1 SPACE
// #define MultiSpacc_Key_Action2 SHIFT
// #define MultiSpacc_Key_Confirm ENTER
// #define MultiSpacc_Key_Cancel ESC
// #define MultiSpacc_Key_Select TAB
// #endif
#if defined(MultiSpacc_Target_SDLCommon) && (defined(MultiSpacc_Target_PC) || defined(MultiSpacc_Target_Web))
#define MultiSpacc_Key_Action1 SPACE
#define MultiSpacc_Key_Action2 SHIFT
#define MultiSpacc_Key_Confirm ENTER
#define MultiSpacc_Key_Cancel ESC
#endif
bool MultiSpacc_CheckKey( char key, char pad );
bool MultiSpacc_CheckKey( int key, char pad );
#endif // _MultiSpacc_Keys_h_

16
LibMultiSpacc/LibMultiSpacc/MultiSpacc.c
View File

@ -92,7 +92,7 @@ int MultiSpacc_SetColorKey( MultiSpacc_Surface *Surface, bool Flag, Uint32 Key )
}
#endif
void MultiSpacc_Sprite( int id, int x, int y, int sprite, MultiSpacc_Surface *Tiles, MultiSpacc_Surface *surface )
void MultiSpacc_SetSprite( int id, int x, int y, int sprite, MultiSpacc_Surface *tiles, MultiSpacc_Surface *screen )
{
#if defined(MultiSpacc_Target_SDLCom)
MultiSpacc_Rect Offset = { .x = x, .y = y, };
@ -102,12 +102,22 @@ void MultiSpacc_Sprite( int id, int x, int y, int sprite, MultiSpacc_Surface *Ti
.w = 8,
.h = 8,
};
SDL_BlitSurface( Tiles, &Clip, surface, &Offset );
SDL_BlitSurface( tiles, &Clip, screen, &Offset );
#elif defined(MultiSpacc_Target_NES)
oam_spr(x, y, sprite, 0, id);
oam_spr( x, y, sprite, 0, id*4 );
#endif
}
void MultiSpacc_SetMetaSprite( int id, int x, int y, MultiSpacc_SpritesMap *map, int mapSize, MultiSpacc_Surface *tiles, MultiSpacc_Surface *screen )
{
int i;
for(i=0; i<mapSize; i++)
{
//oam_spr( (x + map->x[i]), (y + map->y[i]), map->chr[i], 0, (id*4 + 4*i) );
MultiSpacc_SetSprite( (id + i), (x + map->x[i]), (y + map->y[i]), map->chr[i], tiles, screen );
}
}
void MultiSpacc_BlitLayer( MultiSpacc_Surface *source, MultiSpacc_Surface *destination )
{
#if defined(MultiSpacc_Target_SDLCom)

16
LibMultiSpacc/LibMultiSpacc/MultiSpacc.h
View File

@ -63,6 +63,7 @@
#define MultiSpacc_Window char
#define MultiSpacc_Surface char
#define MultiSpacc_Event char
#define main( argc, argv ) main(void)
#endif
#ifdef MultiSpacc_Target_SDLCom
@ -91,6 +92,13 @@ typedef struct MultiSpacc_SurfaceConfig {
Uint32 flags;
} MultiSpacc_SurfaceConfig;
typedef struct MultiSpacc_SpritesMap {
int *chr;
int *x;
int *y;
int *flags;
} MultiSpacc_SpritesMap;
MultiSpacc_Window *MultiSpacc_SetWindow( MultiSpacc_SurfaceConfig *windowConfig );
MultiSpacc_Surface *MultiSpacc_GetWindowSurface( MultiSpacc_Window *Window );
@ -99,21 +107,21 @@ void MultiSpacc_SetAppIcon( MultiSpacc_Window *Window, MultiSpacc_Surface *Icon
bool MultiSpacc_SetMainLoop( bool function( void *args ), void *args );
bool MultiSpacc_WaitUpdateDisplay( MultiSpacc_Window *window, Uint32 *nextTick );
MultiSpacc_Surface *MultiSpacc_LoadImage( char FilePath[], MultiSpacc_Surface *Screen, Uint32 *ColorKey );
int MultiSpacc_SetColorKey( MultiSpacc_Surface *Surface, bool Flag, Uint32 Key );
int MultiSpacc_PollEvent( MultiSpacc_Event *Event );
void MultiSpacc_PrintDebug( const char *format, ... );
void MultiSpacc_PrintText( char Text[], MultiSpacc_Surface *Surface, MultiSpacc_SurfaceConfig *surfaceConfig, int x, int y, MultiSpacc_Surface *Tiles /*, int FontSize, int Color */ ); // WIP
void MultiSpacc_PrintDebug( const char *format, ... );
void MultiSpacc_Sprite( int id, int x, int y, int sprite, MultiSpacc_Surface *Tiles, MultiSpacc_Surface *surface );
void MultiSpacc_SetSprite( int id, int x, int y, int sprite, MultiSpacc_Surface *tiles, MultiSpacc_Surface *screen );
void MultiSpacc_SetMetaSprite( int id, int x, int y, MultiSpacc_SpritesMap *map, int mapSize, MultiSpacc_Surface *tiles, MultiSpacc_Surface *screen );
MultiSpacc_Surface *MultiSpacc_CreateSurface( MultiSpacc_SurfaceConfig *surfaceConfig );
void MultiSpacc_BlitLayer( MultiSpacc_Surface *source, MultiSpacc_Surface *destination );
#include "./Keys.h"
#include "./VideoCycle.h"
#endif // _MultiSpacc_MultiSpacc_h_

9
LibMultiSpacc/LibMultiSpacc/VideoCycle.c
View File

@ -39,3 +39,12 @@ bool MultiSpacc_WaitUpdateDisplay( MultiSpacc_Window *window, Uint32 *nextTick )
}
return true;
}
// #if defined(MultiSpacc_Target_NES)
// bool MultiSpacc_WaitUpdateDisplay_NES(void)
// {
// MultiSpacc_UpdateDisplay(NULL);
// MultiSpacc_WaitFrame(NULL);
// return true;
// }
// #endif

11
LibMultiSpacc/LibMultiSpacc/VideoCycle.h Normal file
View File

@ -0,0 +1,11 @@
#ifndef _MultiSpacc_VideoCycle_h_
#define _MultiSpacc_VideoCycle_h_
bool MultiSpacc_WaitUpdateDisplay( MultiSpacc_Window *window, Uint32 *nextTick );
//#if defined(MultiSpacc_Target_NES)
//bool MultiSpacc_WaitUpdateDisplay_NES(void);
//#define MultiSpacc_WaitUpdateDisplay( a, b ) MultiSpacc_WaitUpdateDisplay_NES()
//#endif
#endif // _MultiSpacc_VideoCycle_h_