Skip to content

Commit

Permalink
- fix teleport left/right/ahead leaving boss room
Browse files Browse the repository at this point in the history 
- add two more stages to the demo:
    # snowbot not showing as enabled
    # add Phantom and Gear stages
        * must add phantom boss
- remove 30 fps mode, it won't work well anyway
    # find other ways to improve speed
  • Loading branch information
@protoman
protoman committed Jul 2, 2017
1 parent e0dda2d commit 65d368f
Show file tree
Hide file tree
Showing 134 changed files with 6,628 additions and 1,556 deletions.
19 changes: 18 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
]# QtCreator arfifact
# QtCreator arfifact
*.user

# qmake artifiacts
Expand All @@ -11,6 +11,23 @@ editor/moc_*.cpp
build/*.cpp
build/*.h
build/editor
build/packages/*.deb
build/packages/*.zip
build/packages/*.txt
build/packages/source
build/packages/ubuntu
build/packages/win32
build/scenesviewer
build/packages/Android/
build/packages/Dingux/
build/packages/PS2/
build/packages/PSP/
stages_v301.dat
cpp_rockbot.pro.user.3.3-pre1
editor/Rockbot_Editor.pro.user.3.3-pre1
editor/build-conversor-Desktop-Debug/
scenes/ScenesViewer/ScenesViewer.pro.user.3.3-pre1
cov-int
*.apk
*.zip
*.elf
Expand Down
53 changes: 27 additions & 26 deletions aux_tools/fps_control.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@

#include <iostream>

#define DEFULT_PLAYER_SPEED 1.2
#define DEFAULT_FPS_MAX 60


#include "timerlib.h"
extern timerLib timer;
Expand All @@ -15,8 +14,9 @@ extern graphicsLib graphLib;
fps_control::fps_control() : fps_timer(0)
{
fps_max = DEFAULT_FPS_MAX;
fps_speed_multiplier = 1.0;
fps_counter = 0;
fps_min_fail_count = 0;
failed_min_fps = false;
}


Expand All @@ -25,6 +25,12 @@ 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()
Expand Down Expand Up @@ -74,29 +80,6 @@ bool fps_control::limit()
return false;
}

void fps_control::set_max_fps(unsigned short max)
{
fps_max = max;
float percent = (100 * fps_max) / DEFAULT_FPS_MAX;

std::cout << "FPS_CONTROL.set_max_fps[" << max << "], percent[" << percent << "]" << std::endl;

if (fps_max < DEFAULT_FPS_MAX) {
fps_speed_multiplier = 1.0 + (percent / 100);
} else if (fps_max == DEFAULT_FPS_MAX) {
fps_speed_multiplier = 1.0;
} else {
fps_speed_multiplier = 1.0 - (percent / 100);
}
max_frame_ticks = (1000.0/(float)fps_max)+0.00001;
}

float fps_control::get_fps_speed_multiplier()
{
//std::cout << "FPS_CONTROL::get_fps_speed_multiplier[" << fps_speed_multiplier << "]" << std::endl;
return fps_speed_multiplier;
}



// ********************************************************************************************** //
Expand All @@ -120,6 +103,14 @@ void fps_control::fps_count()
fps_timer = timer.getTimer()+1000;
}
if (fps_counter > 1) {
if (fps_counter <= FPS_MINIMAL_LIMIT) {
fps_min_fail_count++;
} else {
fps_min_fail_count = 0;
}
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);
}
Expand All @@ -138,3 +129,13 @@ int fps_control::get_frame_drop_n()
return frame_drop_period;
}

bool fps_control::get_failed_min_fps()
{
return failed_min_fps;
}

void fps_control::reset_failed_min_fps()
{
failed_min_fps = false;
}

14 changes: 10 additions & 4 deletions aux_tools/fps_control.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
#ifndef FPS_CONTROL_H
#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 <SDL/SDL.h>

// === FPS limiter by Felipe Zacani === //
Expand All @@ -20,12 +25,11 @@ class fps_control
fps_control();
void initialize();
bool limit();
void set_max_fps(unsigned short max);
float get_fps_speed_multiplier();
void fps_count();
int get_current_frame_n();
int get_frame_drop_n();

bool get_failed_min_fps();
void reset_failed_min_fps();


private:
Expand All @@ -43,14 +47,16 @@ class fps_control
unsigned int target_ticks;

unsigned short fps_max;
float fps_speed_multiplier;

unsigned int 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;
char _fps_buffer[128];

unsigned int fps_min_fail_count; // counts the number of sequential times the FPS is under minumal limit
bool failed_min_fps;

};

#endif // FPS_CONTROL_H
Empty file added build/games/Rockbot1/dialogs/stage_dialogs_-1.dat
View file
Empty file.
120 changes: 60 additions & 60 deletions build/games/Rockbot1/dialogs/stage_dialogs_0.dat
View file
Original file line number Diff line number Diff line change
@@ -1,60 +1,60 @@
KYOTO IS UNDER ATTACK!
WE MUST FIND OUT THE ONE
BEHIND THIS AND STOP HIM!



DON'T WORRY DR. KANOTUS.
I SHALL FIND THIS BAD GUY
AND BRING HIM TO JUSTICE!



ROGER THAT.
I SHALL OBLITERATE
ANY OPPOSITION.



I'LL DO MY BEST, DOCTOR!
JUST HOPE NO ONE GETS
HURT.



THESE IDIOTS NEVER LEARN.
I WONDER IF THEY WILL
GIVE UP THIS TIME.



SO, YOU ARE ONE OF
THOSE ROBOT COPS?
COME AND GET ME!



THE NAME'S ROCKBOT.
LET'S SEE HOW TOUGHT
YOU ARE.



YES. I AM BETABOT.
RESISTANCE IS FUTILE.
SURRENDER OR FACE ME.



MY NAME IS CANDYBOT,
YOU BIG MEANIE! AND
I'M HERE TO STOP YOU!



THE NAMES' KITTYBOT, JERK.
SURRENDER NOW AND I WON'T
HURT YOU VERY MUCH.



START-STG[0] DLG #0
START-STG[0] DLG #1
START-STG[0] DLG #2
START-STG[0] DLG #3
START-STG[0] DLG #4
START-STG[0] DLG #5
START-STG[0] DLG P[1] 0
START-STG[0] DLG P[1] 1
START-STG[0] DLG P[1] 2
START-STG[0] DLG P[1] 3
START-STG[0] DLG P[1] 4
START-STG[0] DLG P[1] 5
START-STG[0] DLG P[2] 0
START-STG[0] DLG P[2] 1
START-STG[0] DLG P[2] 2
START-STG[0] DLG P[2] 3
START-STG[0] DLG P[2] 4
START-STG[0] DLG P[2] 5
START-STG[0] DLG P[3] 0
START-STG[0] DLG P[3] 1
START-STG[0] DLG P[3] 2
START-STG[0] DLG P[3] 3
START-STG[0] DLG P[3] 4
START-STG[0] DLG P[3] 5
START-STG[0] DLG P[4] 0
START-STG[0] DLG P[4] 1
START-STG[0] DLG P[4] 2
START-STG[0] DLG P[4] 3
START-STG[0] DLG P[4] 4
START-STG[0] DLG P[4] 5
BOSS STG[0] DLG #0
BOSS STG[0] DLG #1
BOSS STG[0] DLG #2
BOSS STG[0] DLG #3
BOSS STG[0] DLG #4
BOSS STG[0] DLG #5
BOSS STG[0] DLG P[1] 0
BOSS STG[0] DLG P[1] 1
BOSS STG[0] DLG P[1] 2
BOSS STG[0] DLG P[1] 3
BOSS STG[0] DLG P[1] 4
BOSS STG[0] DLG P[1] 5
BOSS STG[0] DLG P[2] 0
BOSS STG[0] DLG P[2] 1
BOSS STG[0] DLG P[2] 2
BOSS STG[0] DLG P[2] 3
BOSS STG[0] DLG P[2] 4
BOSS STG[0] DLG P[2] 5
BOSS STG[0] DLG P[3] 0
BOSS STG[0] DLG P[3] 1
BOSS STG[0] DLG P[3] 2
BOSS STG[0] DLG P[3] 3
BOSS STG[0] DLG P[3] 4
BOSS STG[0] DLG P[3] 5
BOSS STG[0] DLG P[4] 0
BOSS STG[0] DLG P[4] 1
BOSS STG[0] DLG P[4] 2
BOSS STG[0] DLG P[4] 3
BOSS STG[0] DLG P[4] 4
BOSS STG[0] DLG P[4] 5
60 changes: 60 additions & 0 deletions build/games/Rockbot1/dialogs/stage_dialogs_0_es.dat
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
START-STG[0] DLG #0
START-STG[0] DLG #1
START-STG[0] DLG #2
START-STG[0] DLG #3
START-STG[0] DLG #4
START-STG[0] DLG #5
START-STG[0] DLG P[1] 0
START-STG[0] DLG P[1] 1
START-STG[0] DLG P[1] 2
START-STG[0] DLG P[1] 3
START-STG[0] DLG P[1] 4
START-STG[0] DLG P[1] 5
START-STG[0] DLG P[2] 0
START-STG[0] DLG P[2] 1
START-STG[0] DLG P[2] 2
START-STG[0] DLG P[2] 3
START-STG[0] DLG P[2] 4
START-STG[0] DLG P[2] 5
START-STG[0] DLG P[3] 0
START-STG[0] DLG P[3] 1
START-STG[0] DLG P[3] 2
START-STG[0] DLG P[3] 3
START-STG[0] DLG P[3] 4
START-STG[0] DLG P[3] 5
START-STG[0] DLG P[4] 0
START-STG[0] DLG P[4] 1
START-STG[0] DLG P[4] 2
START-STG[0] DLG P[4] 3
START-STG[0] DLG P[4] 4
START-STG[0] DLG P[4] 5
BOSS STG[0] DLG #0
BOSS STG[0] DLG #1
BOSS STG[0] DLG #2
BOSS STG[0] DLG #3
BOSS STG[0] DLG #4
BOSS STG[0] DLG #5
BOSS STG[0] DLG P[1] 0
BOSS STG[0] DLG P[1] 1
BOSS STG[0] DLG P[1] 2
BOSS STG[0] DLG P[1] 3
BOSS STG[0] DLG P[1] 4
BOSS STG[0] DLG P[1] 5
BOSS STG[0] DLG P[2] 0
BOSS STG[0] DLG P[2] 1
BOSS STG[0] DLG P[2] 2
BOSS STG[0] DLG P[2] 3
BOSS STG[0] DLG P[2] 4
BOSS STG[0] DLG P[2] 5
BOSS STG[0] DLG P[3] 0
BOSS STG[0] DLG P[3] 1
BOSS STG[0] DLG P[3] 2
BOSS STG[0] DLG P[3] 3
BOSS STG[0] DLG P[3] 4
BOSS STG[0] DLG P[3] 5
BOSS STG[0] DLG P[4] 0
BOSS STG[0] DLG P[4] 1
BOSS STG[0] DLG P[4] 2
BOSS STG[0] DLG P[4] 3
BOSS STG[0] DLG P[4] 4
BOSS STG[0] DLG P[4] 5
Loading

0 comments on commit 65d368f

Please sign in to comment.