diff --git a/src/Library/.gitignore b/src/Library/.gitignore index 8be36cce..4bcd7d52 100644 --- a/src/Library/.gitignore +++ b/src/Library/.gitignore @@ -1 +1,2 @@ -src/BootLoader/splash_image_boot.hpp \ No newline at end of file +src/BootLoader/splash_image_pal_boot.hpp +src/BootLoader/splash_image_ntsc_boot.hpp \ No newline at end of file diff --git a/src/Library/Makefile b/src/Library/Makefile index b9221761..cbc2cdbf 100644 --- a/src/Library/Makefile +++ b/src/Library/Makefile @@ -3,7 +3,8 @@ JABY_ENGINE_DIR = ../../ ARTIFACT = libJabyEngine_$(TV_FORMAT) BUILD_DIR = bin -SPLASH_IMAGE = src/BootLoader/splash_image_boot.hpp +SPLASH_IMAGE = src/BootLoader/splash_image_pal_boot.hpp +SPLASH_IMAGE_NTSC = src/BootLoader/splash_image_ntsc_boot.hpp CCFLAGS += -Iinclude -I../../include CCFLAGS += -save-temps=obj @@ -24,13 +25,18 @@ $(LIB_DIR)/$(ARTIFACT).a: $(TARGET).a @mkdir -p $(LIB_DIR) cp $(TARGET).a $(LIB_DIR)/$(ARTIFACT).a +# Improve later $(SPLASH_IMAGE): ressources/Splash.png jaby_engine_fconv $< simple-tim full16 | cpp_out --name SplashScreen -o $@ +$(SPLASH_IMAGE_NTSC): ressources/Splash_ntsc.png + jaby_engine_fconv $< simple-tim full16 | cpp_out --name SplashScreen -o $@ + #Rules section for default compilation and linking -all: $(SPLASH_IMAGE) $(LIB_DIR)/$(ARTIFACT).a +all: $(SPLASH_IMAGE) $(SPLASH_IMAGE_NTSC) $(LIB_DIR)/$(ARTIFACT).a clean: rm -fr $(SPLASH_IMAGE) + rm -fr $(SPLASH_IMAGE_NTSC) rm -fr $(OUTPUT_DIR) rm -fr $(LIB_DIR)/$(ARTIFACT).a \ No newline at end of file diff --git a/src/Library/ressources/Splash.png b/src/Library/ressources/Splash.png index a1a37291..0504b2f5 100644 --- a/src/Library/ressources/Splash.png +++ b/src/Library/ressources/Splash.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2e0c1a6a53217c62a59a61774d771354414b6a92bfc6fc7ef6f59987ee4f01ff -size 221312 +oid sha256:4ca5aebfc2380c4b5e36fc491eec7e1aad65f3336881ad3cbb593eac0faa7ecd +size 101029 diff --git a/src/Library/ressources/Splash_ntsc.png b/src/Library/ressources/Splash_ntsc.png new file mode 100644 index 00000000..e7f7dcd9 --- /dev/null +++ b/src/Library/ressources/Splash_ntsc.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:de46efe930c3e143be231c2acc3b0ae075236536b7ef6cc5f3240ffdec98c5d0 +size 91320 diff --git a/src/Library/src/BootLoader/gpu_boot.cpp b/src/Library/src/BootLoader/gpu_boot.cpp index 622c2a55..106aef30 100644 --- a/src/Library/src/BootLoader/gpu_boot.cpp +++ b/src/Library/src/BootLoader/gpu_boot.cpp @@ -2,14 +2,16 @@ #include #include -#include "splash_image_boot.hpp" +#ifdef JABYENGINE_PAL + #include "splash_image_pal_boot.hpp" +#else + #include "splash_image_ntsc_boot.hpp" +#endif //JABYENGINE_PAL namespace GPU { void display_logo() { - Display::disable(); - // Upload SplashScreen picture - auto state = FileProcessor::create(reinterpret_cast(SplashScreen), SimpleTIM(0, 0, 0, 0)); + auto state = FileProcessor::create(reinterpret_cast(SplashScreen), SimpleTIM(32, 0, 0, 0)); while(state.process((sizeof(SplashScreen)/sizeof(uint32_t)))); Display::enable(); @@ -20,6 +22,7 @@ namespace GPU { Screen::configurate(); Screen::exchange_buffer_and_display(); - quick_fill_fast(Color24::Black(), PositionU16(0, 0), SizeU16(640, 512)); + GPU::wait_ready_for_CMD(); + quick_fill_fast(Color24::Black(), PositionU16(32, 0), SizeU16(Display::Width, Display::Height)); } } \ No newline at end of file