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

Restricted the angle the rubber ball can turn once

Browse Source 
it is close to its target. This gives karts a chance
to escape a rubber ball by driving irretically.
Also added some debug output to indicate when the 
ball lost sight of its target (i.e. the ball was
going directly to a target, but then the target 
was suddenly too far away), so perhaps the ball
should be removed then?
ATM the ball will continue, trying again to hit
the leader in the next round.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9921 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2011-09-30 03:56:25 +00:00
parent 4ed0e79afe
commit 1246744be3
3 changed files with 55 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
data/powerup.xml
View File

@ -23,6 +23,9 @@
target-distance: When the ball is closer than
this to the target, it will aim
directly at the target.
target-max-angle: Once the ball is aiming for its
target, it can at most change the angle
this much per second(!).
min-interpolation-distance: how far the control
points (which are center of squads)
must be from each other. A large value
@ -42,7 +45,8 @@
<item name="rubber-ball" icon="rubber_ball-icon.png"
model="rubber_ball.b3d" speed="35.0" scale="1 1 1"
interval="1" max-height="4.0" min-height="0"
target-distance="50" min-interpolation-distance="10"
target-distance="50" target-max-angle = "90"
min-interpolation-distance="10"
squash-slowdown="0.5" squash-duration="3" />
<item name="parachute" icon="parachute-icon.png"
model="parachute.b3d" />

50
src/items/rubber_ball.cpp
View File

@ -33,6 +33,7 @@ float RubberBall::m_st_min_interpolation_distance;
float RubberBall::m_st_squash_duration;
float RubberBall::m_st_squash_slowdown;
float RubberBall::m_st_target_distance;
float RubberBall::m_st_target_max_angle;
int RubberBall::m_next_id = 0;
RubberBall::RubberBall(Kart *kart, Track* track)
@ -210,8 +211,9 @@ void RubberBall::init(const XMLNode &node, scene::IMesh *bowling)
m_st_interval = 1.0f;
m_st_squash_duration = 3.0f;
m_st_squash_slowdown = 0.5f;
m_st_target_distance = 50.0f;
m_st_min_interpolation_distance = 30.0f;
m_st_target_distance = 50.0f;
m_st_target_max_angle = 25.0f;
if(!node.get("interval", &m_st_interval))
printf("[powerup] Warning: no interval specified for rubber ball.\n");
if(!node.get("squash-duration", &m_st_squash_duration))
@ -220,15 +222,18 @@ void RubberBall::init(const XMLNode &node, scene::IMesh *bowling)
if(!node.get("squash-slowdown", &m_st_squash_slowdown))
printf(
"[powerup] Warning: no squash-slowdown specified for rubber ball.\n");
if(!node.get("target-distance", &m_st_target_distance))
printf(
"[powerup] Warning: no target-distance specified for rubber ball.\n");
if(!node.get("min-interpolation-distance",
&m_st_min_interpolation_distance))
printf(
"[powerup] Warning: no min-interpolation-distance specified "
"for rubber ball.\n");
if(!node.get("target-distance", &m_st_target_distance))
printf(
"[powerup] Warning: no target-distance specified for rubber ball.\n");
if(!node.get("target-max-angle", &m_st_target_max_angle))
printf(
"[powerup] Warning: no target-max-angle specified for rubber ball.\n");
m_st_target_max_angle *= DEGREE_TO_RAD;
Flyable::init(node, bowling, PowerupManager::POWERUP_RUBBERBALL);
} // init
// ----------------------------------------------------------------------------
@ -294,6 +299,40 @@ bool RubberBall::updateAndDelete(float dt)
Vec3 diff = m_target->getXYZ()-getXYZ();
next_xyz = getXYZ() + (dt*m_speed/diff.length())*diff;
Vec3 old_vec = getXYZ()-m_previous_xyz;
Vec3 new_vec = next_xyz - getXYZ();
float angle = atan2(new_vec.getZ(), new_vec.getX())
- atan2(old_vec.getZ(), old_vec.getX());
// Adjust angle to be between -180 and 180 degrees
if(angle < -M_PI)
angle += M_PI;
else if(angle > M_PI)
angle -= M_PI;
// If the angle is too much, adjust next xyz
if(fabsf(angle)>m_st_target_max_angle*dt)
{
core::vector2df old_2d(old_vec.getX(), old_vec.getZ());
if(old_2d.getLengthSQ()==0.0f)
old_2d.Y = 1.0f;
old_2d.normalize();
old_2d.rotateBy( RAD_TO_DEGREE * dt
* (angle > 0 ? m_st_target_max_angle
: -m_st_target_max_angle));
next_xyz.setX(getXYZ().getX() + old_2d.X*dt*m_speed);
next_xyz.setZ(getXYZ().getZ() + old_2d.Y*dt*m_speed);
Vec3 old_vec = getXYZ()-m_previous_xyz;
Vec3 new_vec = next_xyz - getXYZ();
angle = atan2(new_vec.getZ(), new_vec.getX())
- atan2(old_vec.getZ(), old_vec.getX());
// Adjust angle to be between -180 and 180 degrees
if(angle < -M_PI)
angle += M_PI;
else if(angle > M_PI)
angle -= M_PI;
}
// To see if we have overtaken the target, construct a line through
// the rear axles of the kart, and see if the current and the new
// position of the ball are on different sides of the line.
@ -514,6 +553,7 @@ void RubberBall::checkDistanceToTarget()
// directly at the target back to interpolating again.
initializeControlPoints(m_previous_xyz);
m_aiming_at_target = false;
printf("Target lost\n");
}
return;

5
src/items/rubber_ball.hpp
View File

@ -55,6 +55,11 @@ private:
* start to aim directly at the target (and not interpolate anymore). */
static float m_st_target_distance;
/** The maximum angle the ball can change per second when being close
* to the taregt. If the target angle is small, it makes it much harder
* to hit the target, giving it some chances to escape. */
static float m_st_target_max_angle;
/** Each control point chosen must be at least this far away from
* the previous one. This gives smooth 'overall' interpolation
* even if the quads should be close to each other. */