[ADD] game over screen for first version

This commit is contained in:
SemvdH
2021-08-27 21:00:03 +02:00
parent d9c2a6ff31
commit e130382db0
4 changed files with 119 additions and 67 deletions

137
Makefile
View File

@@ -1,5 +1,5 @@
# CMAKE generated file: DO NOT EDIT!
# Generated by "Unix Makefiles" Generator, CMake Version 3.16
# Generated by "Unix Makefiles" Generator, CMake Version 3.18
# Default target executed when no arguments are given to make.
default_target: all
@@ -17,15 +17,34 @@ default_target: all
.SUFFIXES:
# Remove some rules from gmake that .SUFFIXES does not remove.
SUFFIXES =
# Disable VCS-based implicit rules.
% : %,v
# Disable VCS-based implicit rules.
% : RCS/%
# Disable VCS-based implicit rules.
% : RCS/%,v
# Disable VCS-based implicit rules.
% : SCCS/s.%
# Disable VCS-based implicit rules.
% : s.%
.SUFFIXES: .hpux_make_needs_suffix_list
# Suppress display of executed commands.
$(VERBOSE).SILENT:
# Command-line flag to silence nested $(MAKE).
$(VERBOSE)MAKESILENT = -s
#Suppress display of executed commands.
$(VERBOSE).SILENT:
# A target that is always out of date.
cmake_force:
@@ -42,16 +61,16 @@ SHELL = /bin/sh
CMAKE_COMMAND = /usr/bin/cmake
# The command to remove a file.
RM = /usr/bin/cmake -E remove -f
RM = /usr/bin/cmake -E rm -f
# Escaping for special characters.
EQUALS = =
# The top-level source directory on which CMake was run.
CMAKE_SOURCE_DIR = /home/semtex99/vita/samples/cybershot-PSVita
CMAKE_SOURCE_DIR = /home/semtex/samples/cybershot-PSVita
# The top-level build directory on which CMake was run.
CMAKE_BINARY_DIR = /home/semtex99/vita/samples/cybershot-PSVita
CMAKE_BINARY_DIR = /home/semtex/samples/cybershot-PSVita
#=============================================================================
# Targets provided globally by CMake.
@@ -59,7 +78,7 @@ CMAKE_BINARY_DIR = /home/semtex99/vita/samples/cybershot-PSVita
# Special rule for the target rebuild_cache
rebuild_cache:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
/usr/bin/cmake -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
/usr/bin/cmake --regenerate-during-build -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
.PHONY : rebuild_cache
# Special rule for the target rebuild_cache
@@ -80,14 +99,14 @@ edit_cache/fast: edit_cache
# The main all target
all: cmake_check_build_system
$(CMAKE_COMMAND) -E cmake_progress_start /home/semtex99/vita/samples/cybershot-PSVita/CMakeFiles /home/semtex99/vita/samples/cybershot-PSVita/CMakeFiles/progress.marks
$(MAKE) -f CMakeFiles/Makefile2 all
$(CMAKE_COMMAND) -E cmake_progress_start /home/semtex99/vita/samples/cybershot-PSVita/CMakeFiles 0
$(CMAKE_COMMAND) -E cmake_progress_start /home/semtex/samples/cybershot-PSVita/CMakeFiles /home/semtex/samples/cybershot-PSVita//CMakeFiles/progress.marks
$(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 all
$(CMAKE_COMMAND) -E cmake_progress_start /home/semtex/samples/cybershot-PSVita/CMakeFiles 0
.PHONY : all
# The main clean target
clean:
$(MAKE) -f CMakeFiles/Makefile2 clean
$(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 clean
.PHONY : clean
# The main clean target
@@ -97,12 +116,12 @@ clean/fast: clean
# Prepare targets for installation.
preinstall: all
$(MAKE) -f CMakeFiles/Makefile2 preinstall
$(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 preinstall
.PHONY : preinstall
# Prepare targets for installation.
preinstall/fast:
$(MAKE) -f CMakeFiles/Makefile2 preinstall
$(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 preinstall
.PHONY : preinstall/fast
# clear depends
@@ -115,12 +134,12 @@ depend:
# Build rule for target.
cybershot.vpk: cmake_check_build_system
$(MAKE) -f CMakeFiles/Makefile2 cybershot.vpk
$(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 cybershot.vpk
.PHONY : cybershot.vpk
# fast build rule for target.
cybershot.vpk/fast:
$(MAKE) -f CMakeFiles/cybershot.vpk.dir/build.make CMakeFiles/cybershot.vpk.dir/build
$(MAKE) $(MAKESILENT) -f CMakeFiles/cybershot.vpk.dir/build.make CMakeFiles/cybershot.vpk.dir/build
.PHONY : cybershot.vpk/fast
#=============================================================================
@@ -128,12 +147,12 @@ cybershot.vpk/fast:
# Build rule for target.
cybershot.self: cmake_check_build_system
$(MAKE) -f CMakeFiles/Makefile2 cybershot.self
$(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 cybershot.self
.PHONY : cybershot.self
# fast build rule for target.
cybershot.self/fast:
$(MAKE) -f CMakeFiles/cybershot.self.dir/build.make CMakeFiles/cybershot.self.dir/build
$(MAKE) $(MAKESILENT) -f CMakeFiles/cybershot.self.dir/build.make CMakeFiles/cybershot.self.dir/build
.PHONY : cybershot.self/fast
#=============================================================================
@@ -141,40 +160,40 @@ cybershot.self/fast:
# Build rule for target.
cybershot: cmake_check_build_system
$(MAKE) -f CMakeFiles/Makefile2 cybershot
$(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 cybershot
.PHONY : cybershot
# fast build rule for target.
cybershot/fast:
$(MAKE) -f CMakeFiles/cybershot.dir/build.make CMakeFiles/cybershot.dir/build
$(MAKE) $(MAKESILENT) -f CMakeFiles/cybershot.dir/build.make CMakeFiles/cybershot.dir/build
.PHONY : cybershot/fast
home/semtex99/vita/samples/common/debugScreen.obj: home/semtex99/vita/samples/common/debugScreen.c.obj
home/semtex/samples/common/debugScreen.obj: home/semtex/samples/common/debugScreen.c.obj
.PHONY : home/semtex99/vita/samples/common/debugScreen.obj
.PHONY : home/semtex/samples/common/debugScreen.obj
# target to build an object file
home/semtex99/vita/samples/common/debugScreen.c.obj:
$(MAKE) -f CMakeFiles/cybershot.dir/build.make CMakeFiles/cybershot.dir/home/semtex99/vita/samples/common/debugScreen.c.obj
.PHONY : home/semtex99/vita/samples/common/debugScreen.c.obj
home/semtex/samples/common/debugScreen.c.obj:
$(MAKE) $(MAKESILENT) -f CMakeFiles/cybershot.dir/build.make CMakeFiles/cybershot.dir/home/semtex/samples/common/debugScreen.c.obj
.PHONY : home/semtex/samples/common/debugScreen.c.obj
home/semtex99/vita/samples/common/debugScreen.i: home/semtex99/vita/samples/common/debugScreen.c.i
home/semtex/samples/common/debugScreen.i: home/semtex/samples/common/debugScreen.c.i
.PHONY : home/semtex99/vita/samples/common/debugScreen.i
.PHONY : home/semtex/samples/common/debugScreen.i
# target to preprocess a source file
home/semtex99/vita/samples/common/debugScreen.c.i:
$(MAKE) -f CMakeFiles/cybershot.dir/build.make CMakeFiles/cybershot.dir/home/semtex99/vita/samples/common/debugScreen.c.i
.PHONY : home/semtex99/vita/samples/common/debugScreen.c.i
home/semtex/samples/common/debugScreen.c.i:
$(MAKE) $(MAKESILENT) -f CMakeFiles/cybershot.dir/build.make CMakeFiles/cybershot.dir/home/semtex/samples/common/debugScreen.c.i
.PHONY : home/semtex/samples/common/debugScreen.c.i
home/semtex99/vita/samples/common/debugScreen.s: home/semtex99/vita/samples/common/debugScreen.c.s
home/semtex/samples/common/debugScreen.s: home/semtex/samples/common/debugScreen.c.s
.PHONY : home/semtex99/vita/samples/common/debugScreen.s
.PHONY : home/semtex/samples/common/debugScreen.s
# target to generate assembly for a file
home/semtex99/vita/samples/common/debugScreen.c.s:
$(MAKE) -f CMakeFiles/cybershot.dir/build.make CMakeFiles/cybershot.dir/home/semtex99/vita/samples/common/debugScreen.c.s
.PHONY : home/semtex99/vita/samples/common/debugScreen.c.s
home/semtex/samples/common/debugScreen.c.s:
$(MAKE) $(MAKESILENT) -f CMakeFiles/cybershot.dir/build.make CMakeFiles/cybershot.dir/home/semtex/samples/common/debugScreen.c.s
.PHONY : home/semtex/samples/common/debugScreen.c.s
src/main.obj: src/main.c.obj
@@ -182,7 +201,7 @@ src/main.obj: src/main.c.obj
# target to build an object file
src/main.c.obj:
$(MAKE) -f CMakeFiles/cybershot.dir/build.make CMakeFiles/cybershot.dir/src/main.c.obj
$(MAKE) $(MAKESILENT) -f CMakeFiles/cybershot.dir/build.make CMakeFiles/cybershot.dir/src/main.c.obj
.PHONY : src/main.c.obj
src/main.i: src/main.c.i
@@ -191,7 +210,7 @@ src/main.i: src/main.c.i
# target to preprocess a source file
src/main.c.i:
$(MAKE) -f CMakeFiles/cybershot.dir/build.make CMakeFiles/cybershot.dir/src/main.c.i
$(MAKE) $(MAKESILENT) -f CMakeFiles/cybershot.dir/build.make CMakeFiles/cybershot.dir/src/main.c.i
.PHONY : src/main.c.i
src/main.s: src/main.c.s
@@ -200,7 +219,7 @@ src/main.s: src/main.c.s
# target to generate assembly for a file
src/main.c.s:
$(MAKE) -f CMakeFiles/cybershot.dir/build.make CMakeFiles/cybershot.dir/src/main.c.s
$(MAKE) $(MAKESILENT) -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
@@ -209,7 +228,7 @@ src/sprites/sprites.obj: src/sprites/sprites.c.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
$(MAKE) $(MAKESILENT) -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
@@ -218,7 +237,7 @@ src/sprites/sprites.i: src/sprites/sprites.c.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
$(MAKE) $(MAKESILENT) -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
@@ -227,7 +246,7 @@ src/sprites/sprites.s: src/sprites/sprites.c.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
$(MAKE) $(MAKESILENT) -f CMakeFiles/cybershot.dir/build.make CMakeFiles/cybershot.dir/src/sprites/sprites.c.s
.PHONY : src/sprites/sprites.c.s
src/system/control_input.obj: src/system/control_input.c.obj
@@ -236,7 +255,7 @@ src/system/control_input.obj: src/system/control_input.c.obj
# target to build an object file
src/system/control_input.c.obj:
$(MAKE) -f CMakeFiles/cybershot.dir/build.make CMakeFiles/cybershot.dir/src/system/control_input.c.obj
$(MAKE) $(MAKESILENT) -f CMakeFiles/cybershot.dir/build.make CMakeFiles/cybershot.dir/src/system/control_input.c.obj
.PHONY : src/system/control_input.c.obj
src/system/control_input.i: src/system/control_input.c.i
@@ -245,7 +264,7 @@ src/system/control_input.i: src/system/control_input.c.i
# target to preprocess a source file
src/system/control_input.c.i:
$(MAKE) -f CMakeFiles/cybershot.dir/build.make CMakeFiles/cybershot.dir/src/system/control_input.c.i
$(MAKE) $(MAKESILENT) -f CMakeFiles/cybershot.dir/build.make CMakeFiles/cybershot.dir/src/system/control_input.c.i
.PHONY : src/system/control_input.c.i
src/system/control_input.s: src/system/control_input.c.s
@@ -254,7 +273,7 @@ src/system/control_input.s: src/system/control_input.c.s
# target to generate assembly for a file
src/system/control_input.c.s:
$(MAKE) -f CMakeFiles/cybershot.dir/build.make CMakeFiles/cybershot.dir/src/system/control_input.c.s
$(MAKE) $(MAKESILENT) -f CMakeFiles/cybershot.dir/build.make CMakeFiles/cybershot.dir/src/system/control_input.c.s
.PHONY : src/system/control_input.c.s
src/system/timing.obj: src/system/timing.c.obj
@@ -263,7 +282,7 @@ src/system/timing.obj: src/system/timing.c.obj
# target to build an object file
src/system/timing.c.obj:
$(MAKE) -f CMakeFiles/cybershot.dir/build.make CMakeFiles/cybershot.dir/src/system/timing.c.obj
$(MAKE) $(MAKESILENT) -f CMakeFiles/cybershot.dir/build.make CMakeFiles/cybershot.dir/src/system/timing.c.obj
.PHONY : src/system/timing.c.obj
src/system/timing.i: src/system/timing.c.i
@@ -272,7 +291,7 @@ src/system/timing.i: src/system/timing.c.i
# target to preprocess a source file
src/system/timing.c.i:
$(MAKE) -f CMakeFiles/cybershot.dir/build.make CMakeFiles/cybershot.dir/src/system/timing.c.i
$(MAKE) $(MAKESILENT) -f CMakeFiles/cybershot.dir/build.make CMakeFiles/cybershot.dir/src/system/timing.c.i
.PHONY : src/system/timing.c.i
src/system/timing.s: src/system/timing.c.s
@@ -281,7 +300,7 @@ src/system/timing.s: src/system/timing.c.s
# target to generate assembly for a file
src/system/timing.c.s:
$(MAKE) -f CMakeFiles/cybershot.dir/build.make CMakeFiles/cybershot.dir/src/system/timing.c.s
$(MAKE) $(MAKESILENT) -f CMakeFiles/cybershot.dir/build.make CMakeFiles/cybershot.dir/src/system/timing.c.s
.PHONY : src/system/timing.c.s
src/toolbox/drawing.obj: src/toolbox/drawing.c.obj
@@ -290,7 +309,7 @@ src/toolbox/drawing.obj: src/toolbox/drawing.c.obj
# target to build an object file
src/toolbox/drawing.c.obj:
$(MAKE) -f CMakeFiles/cybershot.dir/build.make CMakeFiles/cybershot.dir/src/toolbox/drawing.c.obj
$(MAKE) $(MAKESILENT) -f CMakeFiles/cybershot.dir/build.make CMakeFiles/cybershot.dir/src/toolbox/drawing.c.obj
.PHONY : src/toolbox/drawing.c.obj
src/toolbox/drawing.i: src/toolbox/drawing.c.i
@@ -299,7 +318,7 @@ src/toolbox/drawing.i: src/toolbox/drawing.c.i
# target to preprocess a source file
src/toolbox/drawing.c.i:
$(MAKE) -f CMakeFiles/cybershot.dir/build.make CMakeFiles/cybershot.dir/src/toolbox/drawing.c.i
$(MAKE) $(MAKESILENT) -f CMakeFiles/cybershot.dir/build.make CMakeFiles/cybershot.dir/src/toolbox/drawing.c.i
.PHONY : src/toolbox/drawing.c.i
src/toolbox/drawing.s: src/toolbox/drawing.c.s
@@ -308,7 +327,7 @@ src/toolbox/drawing.s: src/toolbox/drawing.c.s
# target to generate assembly for a file
src/toolbox/drawing.c.s:
$(MAKE) -f CMakeFiles/cybershot.dir/build.make CMakeFiles/cybershot.dir/src/toolbox/drawing.c.s
$(MAKE) $(MAKESILENT) -f CMakeFiles/cybershot.dir/build.make CMakeFiles/cybershot.dir/src/toolbox/drawing.c.s
.PHONY : src/toolbox/drawing.c.s
src/toolbox/toolbox.obj: src/toolbox/toolbox.c.obj
@@ -317,7 +336,7 @@ src/toolbox/toolbox.obj: src/toolbox/toolbox.c.obj
# target to build an object file
src/toolbox/toolbox.c.obj:
$(MAKE) -f CMakeFiles/cybershot.dir/build.make CMakeFiles/cybershot.dir/src/toolbox/toolbox.c.obj
$(MAKE) $(MAKESILENT) -f CMakeFiles/cybershot.dir/build.make CMakeFiles/cybershot.dir/src/toolbox/toolbox.c.obj
.PHONY : src/toolbox/toolbox.c.obj
src/toolbox/toolbox.i: src/toolbox/toolbox.c.i
@@ -326,7 +345,7 @@ src/toolbox/toolbox.i: src/toolbox/toolbox.c.i
# target to preprocess a source file
src/toolbox/toolbox.c.i:
$(MAKE) -f CMakeFiles/cybershot.dir/build.make CMakeFiles/cybershot.dir/src/toolbox/toolbox.c.i
$(MAKE) $(MAKESILENT) -f CMakeFiles/cybershot.dir/build.make CMakeFiles/cybershot.dir/src/toolbox/toolbox.c.i
.PHONY : src/toolbox/toolbox.c.i
src/toolbox/toolbox.s: src/toolbox/toolbox.c.s
@@ -335,7 +354,7 @@ src/toolbox/toolbox.s: src/toolbox/toolbox.c.s
# target to generate assembly for a file
src/toolbox/toolbox.c.s:
$(MAKE) -f CMakeFiles/cybershot.dir/build.make CMakeFiles/cybershot.dir/src/toolbox/toolbox.c.s
$(MAKE) $(MAKESILENT) -f CMakeFiles/cybershot.dir/build.make CMakeFiles/cybershot.dir/src/toolbox/toolbox.c.s
.PHONY : src/toolbox/toolbox.c.s
# Help Target
@@ -344,14 +363,14 @@ help:
@echo "... all (the default if no target is provided)"
@echo "... clean"
@echo "... depend"
@echo "... rebuild_cache"
@echo "... edit_cache"
@echo "... cybershot.vpk"
@echo "... rebuild_cache"
@echo "... cybershot.self"
@echo "... cybershot.vpk"
@echo "... cybershot"
@echo "... home/semtex99/vita/samples/common/debugScreen.obj"
@echo "... home/semtex99/vita/samples/common/debugScreen.i"
@echo "... home/semtex99/vita/samples/common/debugScreen.s"
@echo "... home/semtex/samples/common/debugScreen.obj"
@echo "... home/semtex/samples/common/debugScreen.i"
@echo "... home/semtex/samples/common/debugScreen.s"
@echo "... src/main.obj"
@echo "... src/main.i"
@echo "... src/main.s"

View File

@@ -1,4 +1,4 @@
# Install script for directory: /home/semtex99/vita/samples/cybershot-PSVita
# Install script for directory: /home/semtex/samples/cybershot-PSVita
# Set the install prefix
if(NOT DEFINED CMAKE_INSTALL_PREFIX)
@@ -32,6 +32,11 @@ if(NOT DEFINED CMAKE_CROSSCOMPILING)
set(CMAKE_CROSSCOMPILING "TRUE")
endif()
# Set default install directory permissions.
if(NOT DEFINED CMAKE_OBJDUMP)
set(CMAKE_OBJDUMP "/usr/local/vitasdk/bin/arm-vita-eabi-objdump")
endif()
if(CMAKE_INSTALL_COMPONENT)
set(CMAKE_INSTALL_MANIFEST "install_manifest_${CMAKE_INSTALL_COMPONENT}.txt")
else()
@@ -40,5 +45,5 @@ endif()
string(REPLACE ";" "\n" CMAKE_INSTALL_MANIFEST_CONTENT
"${CMAKE_INSTALL_MANIFEST_FILES}")
file(WRITE "/home/semtex99/vita/samples/cybershot-PSVita/${CMAKE_INSTALL_MANIFEST}"
file(WRITE "/home/semtex/samples/cybershot-PSVita/${CMAKE_INSTALL_MANIFEST}"
"${CMAKE_INSTALL_MANIFEST_CONTENT}")

View File

@@ -511,6 +511,15 @@ void update_gameover()
{
timing_update_timer(&menu_switch_input_delay_timer, deltaTime);
timing_check_timer_elapsed(&menu_switch_input_delay_timer);
timing_update_timer(&start_color_switch_timer, deltaTime);
timing_check_timer_elapsed(&start_color_switch_timer);
if (start_color_switch_timer.elapsed)
{
color_switch_value = !color_switch_value;
start_color_switch_timer.elapsed = 0;
}
if (cross_pressed)
if (menu_switch_input_delay_timer.elapsed)
{
@@ -598,8 +607,8 @@ void draw_menu()
//draw warning triangle
drawing_draw_triangle(320, 240, 280, 300, 360, 300, 3, COLOR_BLACK);
drawing_draw_vline(320-1.5, 255, 30, 6, COLOR_BLACK);
vita2d_draw_rectangle(320-1.5, 290, 6, 6, COLOR_BLACK);
drawing_draw_vline(320 - 1.5, 255, 30, 6, COLOR_BLACK);
vita2d_draw_rectangle(320 - 1.5, 290, 6, 6, COLOR_BLACK);
}
void draw_game()
@@ -631,10 +640,28 @@ void draw_game()
void draw_gameover()
{
char score_text[40];
sprintf(score_text, "score: %07d", score);
vita2d_pvf_draw_text(pvf, 700, 80, RGBA8(0, 255, 0, 255), 1.0f, "Game over");
vita2d_pvf_draw_text(pvf, 700, 100, RGBA8(0, 255, 0, 255), 1.0f, score_text);
unsigned int text_color;
unsigned int background_color;
if (color_switch_value == SCE_TRUE)
{
text_color = COLOR_BLACK;
background_color = COLOR_RED;
}
else
{
background_color = COLOR_BLACK;
text_color = COLOR_RED;
}
drawing_draw_window_filled(SCREEN_WIDTH / 2 - 300 / 2, 50, 300, 100, "You're dead", pgf, background_color);
vita2d_pgf_draw_text(pgf, SCREEN_WIDTH / 2 - 300 / 2 + 47, 50 + 70, text_color, 2.0, "Game Over");
drawing_draw_window_filled(300, 300, 160, 80, "SCORE", pgf, SECONDARY_BORDER_COLOR);
char score_text[15];
sprintf(score_text, "%07d", score);
vita2d_pgf_draw_text(pgf, 322, 357, COLOR_BLACK, 1.2f, score_text);
}
void draw()

View File

@@ -7,6 +7,7 @@
#define COLOR_BLACK (RGBA8(0, 0, 0, 255))
#define COLOR_MAGENTA (RGBA8(251, 41, 255,255))
#define COLOR_CYAN (RGBA8(0, 255, 234,255))
#define COLOR_RED (RGBA8(255,0,0,255))
// /**
// * @brief draws a line with a specified width