kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

clear some warnings.

Browse Source
This commit is contained in:
Campbell Barton 2011-10-09 04:11:18 +00:00
parent e60a7fbc57
commit 6778f7ae05
4 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/gameengine/Ketsji/KX_GameObject.cpp
View File

@ -110,9 +110,9 @@ KX_GameObject::KX_GameObject(
m_pGraphicController(NULL), m_pGraphicController(NULL),
m_xray(false), m_xray(false),
m_pHitObject(NULL), m_pHitObject(NULL),
m_pObstacleSimulation(NULL),
m_actionManager(NULL), m_actionManager(NULL),
m_isDeformable(false), m_isDeformable(false)
m_pObstacleSimulation(NULL)
#ifdef WITH_PYTHON #ifdef WITH_PYTHON
, m_attr_dict(NULL) , m_attr_dict(NULL)
#endif #endif

4
source/gameengine/Ketsji/KX_ObstacleSimulation.cpp
View File

@ -633,7 +633,7 @@ static void processSamples(KX_Obstacle* activeObst, KX_NavMeshObject* activeNavM
const float ivmax = 1.0f / vmax; const float ivmax = 1.0f / vmax;
float adir[2], adist; float adir[2] /*, adist */;
vcpy(adir, activeObst->pvel); vcpy(adir, activeObst->pvel);
if (vlen(adir) > 0.01f) if (vlen(adir) > 0.01f)
vnorm(adir); vnorm(adir);
@ -641,7 +641,7 @@ static void processSamples(KX_Obstacle* activeObst, KX_NavMeshObject* activeNavM
vset(adir,0,0); vset(adir,0,0);
float activeObstPos[2]; float activeObstPos[2];
vset(activeObstPos, activeObst->m_pos.x(), activeObst->m_pos.y()); vset(activeObstPos, activeObst->m_pos.x(), activeObst->m_pos.y());
adist = vdot(adir, activeObstPos); /* adist = vdot(adir, activeObstPos); */
float minPenalty = FLT_MAX; float minPenalty = FLT_MAX;

64
source/gameengine/Ketsji/KX_SteeringActuator.cpp
View File

@ -46,38 +46,38 @@
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
KX_SteeringActuator::KX_SteeringActuator(SCA_IObject *gameobj, KX_SteeringActuator::KX_SteeringActuator(SCA_IObject *gameobj,
int mode, int mode,
KX_GameObject *target, KX_GameObject *target,
KX_GameObject *navmesh, KX_GameObject *navmesh,
float distance, float distance,
float velocity, float velocity,
float acceleration, float acceleration,
float turnspeed, float turnspeed,
bool isSelfTerminated, bool isSelfTerminated,
int pathUpdatePeriod, int pathUpdatePeriod,
KX_ObstacleSimulation* simulation, KX_ObstacleSimulation* simulation,
short facingmode, short facingmode,
bool normalup, bool normalup,
bool enableVisualization) : bool enableVisualization)
SCA_IActuator(gameobj, KX_ACT_STEERING), : SCA_IActuator(gameobj, KX_ACT_STEERING),
m_mode(mode), m_target(target),
m_target(target), m_mode(mode),
m_distance(distance), m_distance(distance),
m_velocity(velocity), m_velocity(velocity),
m_acceleration(acceleration), m_acceleration(acceleration),
m_turnspeed(turnspeed), m_turnspeed(turnspeed),
m_isSelfTerminated(isSelfTerminated), m_simulation(simulation),
m_pathUpdatePeriod(pathUpdatePeriod), m_updateTime(0),
m_updateTime(0), m_obstacle(NULL),
m_isActive(false), m_isActive(false),
m_simulation(simulation), m_isSelfTerminated(isSelfTerminated),
m_enableVisualization(enableVisualization), m_enableVisualization(enableVisualization),
m_facingMode(facingmode), m_facingMode(facingmode),
m_normalUp(normalup), m_normalUp(normalup),
m_obstacle(NULL), m_pathLen(0),
m_pathLen(0), m_pathUpdatePeriod(pathUpdatePeriod),
m_wayPointIdx(-1), m_wayPointIdx(-1),
m_steerVec(MT_Vector3(0, 0, 0)) m_steerVec(MT_Vector3(0, 0, 0))
{ {
m_navmesh = static_cast<KX_NavMeshObject*>(navmesh); m_navmesh = static_cast<KX_NavMeshObject*>(navmesh);
if (m_navmesh) if (m_navmesh)

4
source/gameengine/Ketsji/KX_SteeringActuator.h
View File

@ -56,12 +56,12 @@ class KX_SteeringActuator : public SCA_IActuator
int m_mode; int m_mode;
float m_distance; float m_distance;
float m_velocity; float m_velocity;
float m_acceleration; float m_acceleration;
float m_turnspeed; float m_turnspeed;
KX_ObstacleSimulation* m_simulation; KX_ObstacleSimulation* m_simulation;
KX_Obstacle* m_obstacle;
double m_updateTime; double m_updateTime;
KX_Obstacle* m_obstacle;
bool m_isActive; bool m_isActive;
bool m_isSelfTerminated; bool m_isSelfTerminated;
bool m_enableVisualization; bool m_enableVisualization;