diff --git a/CMakeLists.txt b/CMakeLists.txt index ed69ab1..9203df2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,6 +51,7 @@ link_directories( # Add all the files needed to compile here add_executable(${PROJECT_NAME} src/main.c + src/sprites/sprites.c ../common/debugScreen.c ) diff --git a/Makefile b/Makefile index c8ed762..7f603bd 100644 --- a/Makefile +++ b/Makefile @@ -203,6 +203,33 @@ src/main.c.s: $(MAKE) -f CMakeFiles/cybershot.dir/build.make CMakeFiles/cybershot.dir/src/main.c.s .PHONY : src/main.c.s +src/sprites/sprites.obj: src/sprites/sprites.c.obj + +.PHONY : src/sprites/sprites.obj + +# target to build an object file +src/sprites/sprites.c.obj: + $(MAKE) -f CMakeFiles/cybershot.dir/build.make CMakeFiles/cybershot.dir/src/sprites/sprites.c.obj +.PHONY : src/sprites/sprites.c.obj + +src/sprites/sprites.i: src/sprites/sprites.c.i + +.PHONY : src/sprites/sprites.i + +# target to preprocess a source file +src/sprites/sprites.c.i: + $(MAKE) -f CMakeFiles/cybershot.dir/build.make CMakeFiles/cybershot.dir/src/sprites/sprites.c.i +.PHONY : src/sprites/sprites.c.i + +src/sprites/sprites.s: src/sprites/sprites.c.s + +.PHONY : src/sprites/sprites.s + +# target to generate assembly for a file +src/sprites/sprites.c.s: + $(MAKE) -f CMakeFiles/cybershot.dir/build.make CMakeFiles/cybershot.dir/src/sprites/sprites.c.s +.PHONY : src/sprites/sprites.c.s + # Help Target help: @echo "The following are some of the valid targets for this Makefile:" @@ -220,6 +247,9 @@ help: @echo "... src/main.obj" @echo "... src/main.i" @echo "... src/main.s" + @echo "... src/sprites/sprites.obj" + @echo "... src/sprites/sprites.i" + @echo "... src/sprites/sprites.s" .PHONY : help diff --git a/src/main.c b/src/main.c index 3c89acd..eb8e000 100644 --- a/src/main.c +++ b/src/main.c @@ -8,6 +8,8 @@ #include +#include "sprites/sprites.h" + // 14 april 2021: 11:00-15:00 #define printf psvDebugScreenPrintf @@ -35,6 +37,8 @@ int main(int argc, char *argv[]) memset(&pad, 0, sizeof(pad)); + BULLET b1 = {1,200,200,RGBA8(255,0,255,255)}; + while (1) { sceCtrlPeekBufferPositive(0, &pad, 1); @@ -50,7 +54,9 @@ int main(int argc, char *argv[]) vita2d_pgf_draw_text(pgf, 700, 30, RGBA8(0,255,0,255), 1.0f, "PGF Font sample!"); vita2d_pvf_draw_text(pvf, 700, 80, RGBA8(0,255,0,255), 1.0f, "PVF Font sample!"); - + + sprites_draw_bullet(&b1); + vita2d_end_drawing(); vita2d_swap_buffers(); }