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

Added addSphere to irr_driver to make debugging code a bit more flexible.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11655 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2012-10-01 21:53:40 +00:00
parent 0d97658552
commit fdd4739d94
3 changed files with 35 additions and 12 deletions

21
src/graphics/irr_driver.cpp

@ -795,6 +795,27 @@ scene::IMeshSceneNode *IrrDriver::addOctTree(scene::IMesh *mesh)
return m_scene_manager->addOctreeSceneNode(mesh);
} // addOctTree
// ----------------------------------------------------------------------------
/** Adds a sphere with a given radius and color.
* \param radius The radius of the sphere.
* \param color The color to use (default (0,0,0,0)
*/
scene::IMeshSceneNode *IrrDriver::addSphere(float radius,
const video::SColor &color)
{
scene::IMeshSceneNode *node = m_scene_manager->addSphereSceneNode(radius);
node->setMaterialType(video::EMT_SOLID);
scene::IMesh *mesh = node->getMesh();
mesh->setMaterialFlag(video::EMF_COLOR_MATERIAL, true);
video::SMaterial m;
m.AmbientColor = color;
m.DiffuseColor = color;
m.EmissiveColor = color;
m.BackfaceCulling = false;
mesh->getMeshBuffer(0)->getMaterial() = m;
return node;
} // addSphere
// ----------------------------------------------------------------------------
/** Adds a particle scene node.
*/

2
src/graphics/irr_driver.hpp

@ -158,6 +158,8 @@ public:
scene::ISceneNode *addWaterNode(scene::IMesh *mesh, float wave_height,
float wave_speed, float wave_length);
scene::IMeshSceneNode*addOctTree(scene::IMesh *mesh);
scene::IMeshSceneNode*addSphere(float radius,
const video::SColor &color=video::SColor(128, 255, 255, 255));
scene::IMeshSceneNode*addMesh(scene::IMesh *mesh,
scene::ISceneNode *parent=NULL);
PerCameraNode *addPerCameraMesh(scene::IMesh* mesh,

24
src/karts/controller/skidding_ai.cpp

@ -166,8 +166,11 @@ SkiddingAI::SkiddingAI(AbstractKart *kart)
m_false_start_probability = 0.0f;
}
#ifdef AI_DEBUG
m_debug_sphere = irr_driver->getSceneManager()->addSphereSceneNode(1.0f);
m_item_sphere = irr_driver->getSceneManager()->addSphereSceneNode(1.0f);
int k = m_kart->getWorldKartId() % 2;
video::SColor col_debug(128, k ? 128 : 0, k ? 0 : 128, 0);
m_debug_sphere = irr_driver->addSphere(1.0f, col_debug);
m_item_sphere = irr_driver->addSphere(1.0f);
#define CURVE_PREDICT1 0
#define CURVE_KART 1
#define CURVE_LEFT 2
@ -193,12 +196,12 @@ SkiddingAI::SkiddingAI(AbstractKart *kart)
#endif
#ifdef AI_DEBUG_NEW_FIND_NON_CRASHING
m_curve[CURVE_LEFT] = new ShowCurve(0.5f, 0.5f,
irr::video::SColor(128, 128, 0, 0));
video::SColor(128, 128, 0, 0));
m_curve[CURVE_RIGHT] = new ShowCurve(0.5f, 0.5f,
irr::video::SColor(128, 0, 128, 0));
video::SColor(128, 0, 128, 0));
#endif
m_curve[CURVE_QG] = new ShowCurve(0.5f, 0.5f,
irr::video::SColor(128, 0, 128, 0));
video::SColor(128, 0, 128, 0));
#ifdef AI_DEBUG_KART_AIM
irr::video::SColor c1;
if(m_item_behaviour == ITEM_COLLECT_PRIORITY)
@ -210,7 +213,6 @@ SkiddingAI::SkiddingAI(AbstractKart *kart)
#endif
#endif
} // SkiddingAI
//-----------------------------------------------------------------------------
@ -576,7 +578,6 @@ void SkiddingAI::handleSteering(float dt)
findNonCrashingPoint2(&aim_point, &last_node);
else
findNonCrashingPoint(&aim_point, &last_node);
#ifdef AI_DEBUG
m_debug_sphere->setPosition(aim_point.toIrrVector());
#endif
@ -1680,8 +1681,8 @@ void SkiddingAI::checkCrashes(const Vec3& pos )
* left line:
*
* X The new left line connecting kart to X will be to the right
* of the old left line, so the available space for the kart
* \ / (
* of the old left line, so the available area for the kart
* \ / will be dictated by the new left line.
* \ /
* kart
* Similarly for the right side. This will narrow down the available area
@ -1770,7 +1771,6 @@ void SkiddingAI::findNonCrashingPoint2(Vec3 *result, int *last_node)
// Now look for the next curve to find out to which side of the
// track the AI should aim at
*last_node = m_track_node;
int count = 0;
while(1)
@ -1844,7 +1844,7 @@ void SkiddingAI::findNonCrashingPoint(Vec3 *aim_position, int *last_node)
// The original while(1) loop is replaced with a for loop to avoid
// infinite loops (which we had once or twice). Usually the number
// of iterations in the while loop is less than 7.
for(unsigned int i=0; i<100; i++)
for(unsigned int j=0; j<100; j++)
{
// target_sector is the sector at the longest distance that we can
// drive to without crashing with the track.
@ -1863,7 +1863,7 @@ void SkiddingAI::findNonCrashingPoint(Vec3 *aim_position, int *last_node)
// 20 steps)
if( steps>1000) steps = 1000;
//Protection against having vel_normal with nan values
// Protection against having vel_normal with nan values
if(len>0.0f) {
direction*= 1.0f/len;
}