Merge upstream

Makefile.psp

@@ -1,31 +1,35 @@
-PSPSDK=/opt/pspsdk/psp/
+PSPSDK=/media/iuri/SamsungEXT4/development/SDK/PSP/sdk/
+export PATH=$PATH:/media/iuri/SamsungEXT4/development/SDK/PSP/sdk/bin
 
-TARGET = rockbot
-OBJS   = main.o options/key_map.o inputlib.o timerlib.o soundlib.o file/file_io.o collision_detection.o graphicslib.o \
+TARGET = rockbot_psp
+OBJS   = main.o data/datautil.o options/key_map.o inputlib.o timerlib.o soundlib.o file/file_io.o collision_detection.o graphicslib.o \
 sceneslib.o stage_select.o graphic/option_picker.o classmap.o objects/object.o character/character.o projectilelib.o \
 graphic/animation.o stage.o stage_select.o class_config.o scenes/dialogs.o game.o character/classplayer.o \
 character/classnpc.o character/artificial_inteligence.o aux_tools/trajectory_parabola.o file/convert.o \
 graphic/draw.o graphic/gfx_sin_wave.o character/movement/jump.o character/movement/inertia.o scenes/sceneshow.o \
 game_mediator.o ports/psp/psp_ram.o strings_map.o file/fio_strings.o file/fio_common.o \
-file/fio_scenes.o aux_tools/stringutils.o aux_tools/fps_control.o docs/game_manual.o aux_tools/exception_manager.o \
-character/character_animation.o scenes/game_menu.o
+file/fio_scenes.o aux_tools/stringutils.o aux_tools/fps_control.o aux_tools/exception_manager.o \
+character/character_animation.o scenes/game_menu.o shareddata.o logger.o
+
 
-INCDIR   = /opt/pspsdk/psp/sdk/include
+INCDIR   = /media/iuri/SamsungEXT4/development/SDK/PSP/sdk/psp/include/
 CFLAGS   = -G0 -Wall -O3 -DPSP -DHANDHELD -g -fexceptions
-CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti -g -fexceptions
+CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti -g -fexceptions -I/media/iuri/SamsungEXT4/development/SDK/PSP/sdk/psp/sdk/include -I/media/iuri/SamsungEXT4/development/SDK/PSP/sdk/psp/include/ -I/media/iuri/SamsungEXT4/development/SDK/PSP/sdk/psp/include/SDL/
 ASFLAGS  = $(CFLAGS)
 
 LIBDIR  =
 LDFLAGS =
-LIBS    = -lm -lc -lstdc++ -lc -lSDL_gfx -lSDL_mixer -lvorbisidec -logg -lmikmod -lmmio -lsmpeg -lSDL_ttf -lfreetype -lSDL_image -ljpeg -lpng -lz `$(PSPSDK)/bin/sdl-config --libs` -lpspirkeyb -lpsppower -L$(PSPSDK)/sdk/lib
+LIBS    = -lm -lc -lstdc++ -lc -lSDL_gfx -lSDL_mixer -logg -lmikmod -lsmpeg -lSDL_ttf -lfreetype -lSDL_image -ljpeg -lpng -lz \
+    -lSDLmain -lSDL -lm -lGL -lm -L/usr/local/pspdev/psp/sdk/lib -L/usr/local/pspdev/psp -lpspirkeyb -lpsppower -lpspvfpu -lpspdebug \
+    -lpspgu -lpspctrl -lpspge -lpspdisplay -lpsphprm -lpspaudio \
+    -L$(PSPSDK)/sdk/lib -L/media/iuri/SamsungEXT4/development/SDK/PSP/sdk/psp/sdk/lib
 
 BUILD_PRX=1 
 PSP_LARGE_MEMORY = 1 
-
-
 EXTRA_TARGETS   = EBOOT.PBP
-PSP_EBOOT_TITLE = Rockbot 1.0
-PSP_EBOOT_ICON= ./build/packages/files/psp_icon.png
-PSP_EBOOT_PIC1= ./build/packages/files/psp_background.png
 
-include /opt/pspsdk/psp/sdk/lib/build.mak
+PSP_EBOOT_TITLE = Rockbot $(VERSIONNAME)
+PSP_EBOOT_ICON= ./build/packages/files/psp_icon$($version_number).png
+PSP_EBOOT_PIC1= ./build/packages/files/psp_background$($version_number).png
+
+include /media/iuri/SamsungEXT4/development/SDK/PSP/sdk/psp/sdk/lib/build.mak

Rockbot.pro

@@ -12,10 +12,10 @@ QT       -= gui
 
 
 #CONFIG += linux
-CONFIG += raspberry
+#CONFIG += raspberry
 #CONFIG += android
 #CONFIG += win32
-#CONFIG += playstation2
+CONFIG += playstation2
 #CONFIG += dingux
 #CONFIG += open_pandora
 #CONFIG += wii
@@ -25,6 +25,7 @@ CONFIG += raspberry
 # -m64 problem in android build:
 # NOTE for android build on 64: /usr/share/qt4/mkspecs/default/qmake.conf
 # or, in QT5, /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64/qmake.conf
+# or, in a install in home (qt5),
 
 
 ### BETA VERSION ###
@@ -224,6 +225,7 @@ dingux {
 
 
 playstation2 {
+        QMAKESPEC=./ports/ps2/g++-ps2.conf
         DEFINES+= PLAYSTATION2=1
 	TARGET = rockbot.elf
 

aux_tools/exception_manager.cpp

@@ -1,11 +1,5 @@
 #include "exception_manager.h"
 
-#include <cstdio>
-#include <cstdlib>
-#include <string>
-#include <sstream>
-
-
 exception_manager::exception_manager()
 {
 
@@ -14,26 +8,29 @@ exception_manager::exception_manager()
 
 void exception_manager::throw_param_exception(std::string prefix, std::string param)
 {
+    std::cout << "### PARAM-EXCEPTION - prefix[" << prefix << "], param[" << param << "]" << std::endl;
     std::string backtrace = get_backtrace();
     char error_msg[512+backtrace.size()];
     sprintf(error_msg, "Exception: Invalid parameter [%s] - value[%s]\nBacktrace:\n[%s]", prefix.c_str(), param.c_str(), backtrace.c_str());
-    throw std::invalid_argument(error_msg);
+    //throw std::invalid_argument(error_msg);
 }
 
 void exception_manager::throw_file_not_found_exception(std::string prefix, std::string param)
 {
+    std::cout << "### FILE-NOT-FOUND-EXCEPTION - prefix[" << prefix << "], param[" << param << "]" << std::endl;
     std::string backtrace = get_backtrace();
     char error_msg[512+backtrace.size()];
     sprintf(error_msg, "Exception: file not found[%s] - file[%s]\nBacktrace:\n[%s]", prefix.c_str(), param.c_str(), backtrace.c_str());
-    throw std::invalid_argument(error_msg);
+    //throw std::invalid_argument(error_msg);
 }
 
 void exception_manager::throw_general_exception(std::string prefix, std::string param)
 {
+    std::cout << "### -GENERAL-EXCEPTION - prefix[" << prefix << "], param[" << param << "]" << std::endl;
     std::string backtrace = get_backtrace();
     char error_msg[512+backtrace.size()];
     sprintf(error_msg, "Exception: runtime error[%s] - code[%s]\nBacktrace:\n[%s]", prefix.c_str(), param.c_str(), backtrace.c_str());
-    throw std::runtime_error(error_msg);
+    //throw std::runtime_error(error_msg);
 }
 
 #ifdef ANDROID
@@ -51,16 +48,16 @@ _Unwind_Reason_Code exception_manager::unwindCallback(struct _Unwind_Context* co
 }
 
 size_t  exception_manager::captureBacktrace(void** buffer, size_t max) {
-    __android_log_print(ANDROID_LOG_INFO, "###ROCKBOT2###", "exception_manager::captureBacktrace #1");
+    __android_log_print(ANDROID_LOG_INFO, "###ROCKBOT###", "exception_manager::captureBacktrace #1");
     BacktraceState state = {buffer, buffer + max};
     _Unwind_Backtrace(unwindCallback, &state);
 
-    __android_log_print(ANDROID_LOG_INFO, "###ROCKBOT2###", "exception_manager::captureBacktrace #2");
+    __android_log_print(ANDROID_LOG_INFO, "###ROCKBOT###", "exception_manager::captureBacktrace #2");
     return state.current - buffer;
 }
 
 void exception_manager::dumpBacktrace(std::ostream& os, void** buffer, size_t count) {
-    __android_log_print(ANDROID_LOG_INFO, "###ROCKBOT2###", "exception_manager::dumpBacktrace #1");
+    __android_log_print(ANDROID_LOG_INFO, "###ROCKBOT###", "exception_manager::dumpBacktrace #1");
     for (size_t idx = 0; idx < count; ++idx) {
         const void* addr = buffer[idx];
         const char* symbol = "";
@@ -72,7 +69,7 @@ void exception_manager::dumpBacktrace(std::ostream& os, void** buffer, size_t co
 
         os << "  #" << std::setw(2) << idx << ": " << addr << "  " << symbol << "\n";
     }
-    __android_log_print(ANDROID_LOG_INFO, "###ROCKBOT2###", "exception_manager::dumpBacktrace #2");
+    __android_log_print(ANDROID_LOG_INFO, "###ROCKBOT###", "exception_manager::dumpBacktrace #2");
 }
 
 void exception_manager::getBacktrace(std::ostringstream &oss, const size_t max)

aux_tools/exception_manager.h

@@ -13,6 +13,11 @@
 #include <unwind.h>
 #include <dlfcn.h>
 #include <android/log.h>
+#include <cstdio>
+#include <cstdlib>
+#include <string>
+#include <sstream>
+
 #endif
 
 struct BacktraceState

aux_tools/fps_control.cpp

@@ -1,19 +1,17 @@
 #include "fps_control.h"
 
-#include <iostream>
+#include <algorithm>    // std::find
 
-
-
-#include "timerlib.h"
+#include "../timerlib.h"
 extern timerLib timer;
 
-#include "graphicslib.h"
+#include "../graphicslib.h"
 extern graphicsLib graphLib;
 
 
 fps_control::fps_control() : fps_timer(0)
 {
-    fps_max = DEFAULT_FPS_MAX;
+    fps_max = SharedData::get_instance()->get_max_fps();
     fps_counter = 0;
     fps_min_fail_count = 0;
     failed_min_fps = false;
@@ -25,12 +23,6 @@ void fps_control::initialize()
     max_frame_ticks = (1000.0/(float)fps_max)+0.00001;
     frame_count = 0;
     last_second_ticks = timer.getTimer();
-    /*
-    fps_max = max;
-    float percent = (100 * fps_max) / DEFAULT_FPS_MAX;
-    std::cout << "FPS_CONTROL.set_max_fps[" << max << "], percent[" << percent << "]" << std::endl;
-    max_frame_ticks = (1000.0/(float)fps_max)+0.00001;
-    */
 }
 
 bool fps_control::limit()
@@ -41,7 +33,6 @@ bool fps_control::limit()
     ++frame_count;
     target_ticks = last_second_ticks + static_cast<unsigned int>(frame_count * max_frame_ticks);
     current_ticks = timer.getTimer();
-    //std::cout << "fps_control::limit::timer.ticks[" << timer.getTimer() << "], sdl.ticks[" << current_ticks << "]" << std::endl;
 
     average_ticks += current_ticks - last_frame_ticks;
     if (current_ticks - last_frame_ticks <= min_ticks)
@@ -93,16 +84,16 @@ void fps_control::fps_count()
     fps_counter++;
     if (fps_timer <= timer.getTimer()) {
         sprintf(_fps_buffer, "FPS: %d", fps_counter);
-        if (fps_counter <= DEFAULT_FPS_MAX-4) {
-            frame_drop_period = DEFAULT_FPS_MAX/(DEFAULT_FPS_MAX-fps_counter);
-            //std::cout << "frame_drop_period[" << frame_drop_period << "], fps_counter[" << fps_counter << "]" << std::endl;
+        if (fps_counter <= fps_timer-4) {
+            frame_drop_period = fps_timer/(fps_timer-fps_counter);
         } else {
             frame_drop_period = 0;
         }
         fps_counter = 0;
         fps_timer = timer.getTimer()+1000;
     }
     if (fps_counter > 1) {
+        /*
         if (fps_counter <= FPS_MINIMAL_LIMIT) {
             fps_min_fail_count++;
         } else {
@@ -111,6 +102,7 @@ void fps_control::fps_count()
         if (fps_min_fail_count >= FPS_MINIMAL_MAX_FAIL) {
             failed_min_fps = true;
         }
+        */
         std::string temp_str(_fps_buffer);
         graphLib.draw_text(12, 2, temp_str);
     }
@@ -139,3 +131,38 @@ void fps_control::reset_failed_min_fps()
     failed_min_fps = false;
 }
 
+void fps_control::set_frameskip(int skip_n)
+{
+    frameskip_list.clear();
+    if (skip_n == 1) {
+        frameskip_list.push_back(1);
+    } else if (skip_n == 2) {
+        frameskip_list.push_back(1);
+        frameskip_list.push_back(6);
+    } else if (skip_n == 3) {
+        frameskip_list.push_back(1);
+        frameskip_list.push_back(4);
+        frameskip_list.push_back(7);
+    } else if (skip_n == 4) {
+        frameskip_list.push_back(1);
+        frameskip_list.push_back(3);
+        frameskip_list.push_back(6);
+        frameskip_list.push_back(9);
+    } else if (skip_n == 5) {
+        frameskip_list.push_back(1);
+        frameskip_list.push_back(3);
+        frameskip_list.push_back(5);
+        frameskip_list.push_back(7);
+        frameskip_list.push_back(9);
+    }
+}
+
+bool fps_control::must_skip_frame()
+{
+    int frame_unit_part = frame_count % 10;
+    if (std::find(frameskip_list.begin(), frameskip_list.end(), frame_unit_part) != frameskip_list.end()) {
+        return true;
+    }
+    return false;
+}
+

aux_tools/fps_control.h

@@ -2,11 +2,13 @@
 #define FPS_CONTROL_H
 
 #define DEFULT_PLAYER_SPEED 1.2
-#define DEFAULT_FPS_MAX 60
 #define FPS_MINIMAL_LIMIT 50            // if fps is lower or equal this value, we increment fail-count
 #define FPS_MINIMAL_MAX_FAIL 10         // if we have 10 consecutive times fps is under limit, we take action
 
+#include <iostream>
 #include <SDL/SDL.h>
+#include <vector>
+#include "shareddata.h"
 
 // === FPS limiter by Felipe Zacani === //
 
@@ -30,7 +32,8 @@ class fps_control
     int get_frame_drop_n();
     bool get_failed_min_fps();
     void reset_failed_min_fps();
-
+    void set_frameskip(int skip_n);
+    bool must_skip_frame();
 
 private:
     st_fps_data data;
@@ -48,7 +51,7 @@ class fps_control
 
     unsigned short fps_max;
 
-    unsigned int fps_timer;
+    unsigned long fps_timer;
     int fps_counter;
     // if we are getting less than 60 fps, this will tell main loop how many times it will run full until drop one
     unsigned short frame_drop_period;
@@ -57,6 +60,7 @@ class fps_control
     unsigned int fps_min_fail_count; // counts the number of sequential times the FPS is under minumal limit
     bool failed_min_fps;
 
+    std::vector<int> frameskip_list;
 };
 
 #endif // FPS_CONTROL_H

aux_tools/stringutils.cpp

@@ -1,7 +1,5 @@
 #include "stringutils.h"
 
-
-
 StringUtils::StringUtils()
 {
 

aux_tools/stringutils.h

@@ -3,9 +3,8 @@
 
 #include <string>
 #include <vector>
-#include <stdio.h>
 #include <cstdlib>
-#include <string.h>
+#include <cstring>
 
 class StringUtils
 {

aux_tools/trajectory_parabola.cpp

@@ -34,7 +34,6 @@ void trajectory_parabola::set_distance(int dist)
     if (_reducefactor <= 0) {
         _reducefactor = 0.4;
     }
-    //std::cout << ">>>> DEBUG #2 _reducefactor: " << _reducefactor << ", _max_point: " << _max_point << " speed: " << _v << " <<<<<" << std::endl;
 }
 
 int trajectory_parabola::get_y_point(int n) const
@@ -51,9 +50,6 @@ int trajectory_parabola::get_y_point(int n) const
     if (_reducefactor != 0) {
         reduced_y = (int)(y/_reducefactor);
     }
-    if (reduced_y <= -21474834) {
-        std::cout << ">>>parabola::get_y_point - n: " << n << ", _max_point: " << _reducefactor << ", y: " << y << ", reduced_y: " << reduced_y << std::endl;
-    }
     return reduced_y;
 }