ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improved documentation, renamed variables, simplified code somewhat.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11810 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk
2012-10-29 00:09:05 +00:00
parent 34d8e1d2d5
commit dca5e568af
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/states_screens/race_gui_base.cpp
View File

@@ -1038,15 +1038,10 @@ void RaceGUIBase::drawPlungerInFace(const AbstractKart *kart, float dt)
if(m_plunger_state == PLUNGER_STATE_INIT)
{
RandomGenerator random;
m_plunger_move_time = 0.1f+random.get(50)/200.0f;
m_plunger_move_time = 0.0f;
m_plunger_offset = core::vector2di(0,0);
m_plunger_state = PLUNGER_STATE_NOMOVE;
m_plunger_state = PLUNGER_STATE_SLOW_2;
m_plunger_speed = core::vector2df(0, 0);
float movement_fraction = 0.3f;
m_plunger_x_target = screen_width/2
+ random.get((int)(screen_width*movement_fraction))
- (int)(screen_width*movement_fraction*0.5f);
}
m_plunger_move_time -= dt;
@@ -1055,9 +1050,16 @@ void RaceGUIBase::drawPlungerInFace(const AbstractKart *kart, float dt)
const float fast_time = 0.3f;
if(kart->getBlockedByPlungerTime()<fast_time)
{
// First time we reach faste state: select random target point
// at top of screen and set speed accordingly
RandomGenerator random;
float movement_fraction = 0.3f;
int plunger_x_target = screen_width/2
+ random.get((int)(screen_width*movement_fraction))
- (int)(screen_width*movement_fraction*0.5f);
m_plunger_state = PLUNGER_STATE_FAST;
m_plunger_speed =
core::vector2df((m_plunger_x_target-screen_width/2)/fast_time,
core::vector2df((plunger_x_target-screen_width/2)/fast_time,
viewport.getHeight()*0.5f/fast_time);
m_plunger_move_time = fast_time;
}
@@ -1066,16 +1068,16 @@ void RaceGUIBase::drawPlungerInFace(const AbstractKart *kart, float dt)
RandomGenerator random;
m_plunger_move_time = 0.1f+random.get(50)/200.0f;
// Plunger is either moving or not moving
if(m_plunger_state==PLUNGER_STATE_NOMOVE)
if(m_plunger_state==PLUNGER_STATE_SLOW_1)
{
m_plunger_state = PLUNGER_STATE_SLOW;
m_plunger_state = PLUNGER_STATE_SLOW_2;
m_plunger_speed =
core::vector2df(0, 0.05f*viewport.getHeight()
/m_plunger_move_time );
}
else
{
m_plunger_state = PLUNGER_STATE_NOMOVE;
m_plunger_state = PLUNGER_STATE_SLOW_1;
m_plunger_speed =
core::vector2df(0, 0.02f*viewport.getHeight()
/m_plunger_move_time );

14
src/states_screens/race_gui_base.hpp
View File

@@ -150,19 +150,17 @@ protected:
/** Material for the 'plunger in the face' texture. */
Material *m_plunger_face;
/** State of the plunger: the plunger switches between not moving and slow
* moving till the end of the plunger time is nearly reached, in which
* case it changes to fast moving. */
enum PlungerState {PLUNGER_STATE_INIT, PLUNGER_STATE_SLOW,
PLUNGER_STATE_NOMOVE, PLUNGER_STATE_FAST}
/** State of the plunger: From the 'init' states the plunger switches
* between two slow moving states ('shakily moving') till the end of
* the plunger time is nearly reached, then it goes to a very fast
* moving state ('plunger blown off'). */
enum PlungerState {PLUNGER_STATE_INIT, PLUNGER_STATE_SLOW_1,
PLUNGER_STATE_SLOW_2, PLUNGER_STATE_FAST}
m_plunger_state;
/** How long the plunger should stay in the current state. */
float m_plunger_move_time;
/** The x position at which the plunger should end, randomly determined. */
int m_plunger_x_target;
/** Offset of the plunger. */
core::vector2di m_plunger_offset;