Revision: 40871
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40871
Author: campbellbarton
Date: 2011-10-09 04:11:18 +0000 (Sun, 09 Oct 2011)
Log Message:
-----------
clear some warnings.
Modified Paths:
--------------
trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp
trunk/blender/source/gameengine/Ketsji/KX_ObstacleSimulation.cpp
trunk/blender/source/gameengine/Ketsji/KX_SteeringActuator.cpp
trunk/blender/source/gameengine/Ketsji/KX_SteeringActuator.h
Modified: trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp 2011-10-09
03:05:36 UTC (rev 40870)
+++ trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp 2011-10-09
04:11:18 UTC (rev 40871)
@@ -110,9 +110,9 @@
m_pGraphicController(NULL),
m_xray(false),
m_pHitObject(NULL),
+ m_pObstacleSimulation(NULL),
m_actionManager(NULL),
- m_isDeformable(false),
- m_pObstacleSimulation(NULL)
+ m_isDeformable(false)
#ifdef WITH_PYTHON
, m_attr_dict(NULL)
#endif
Modified: trunk/blender/source/gameengine/Ketsji/KX_ObstacleSimulation.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_ObstacleSimulation.cpp
2011-10-09 03:05:36 UTC (rev 40870)
+++ trunk/blender/source/gameengine/Ketsji/KX_ObstacleSimulation.cpp
2011-10-09 04:11:18 UTC (rev 40871)
@@ -633,7 +633,7 @@
const float ivmax = 1.0f / vmax;
- float adir[2], adist;
+ float adir[2] /*, adist */;
vcpy(adir, activeObst->pvel);
if (vlen(adir) > 0.01f)
vnorm(adir);
@@ -641,7 +641,7 @@
vset(adir,0,0);
float activeObstPos[2];
vset(activeObstPos, activeObst->m_pos.x(), activeObst->m_pos.y());
- adist = vdot(adir, activeObstPos);
+ /* adist = vdot(adir, activeObstPos); */
float minPenalty = FLT_MAX;
Modified: trunk/blender/source/gameengine/Ketsji/KX_SteeringActuator.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_SteeringActuator.cpp
2011-10-09 03:05:36 UTC (rev 40870)
+++ trunk/blender/source/gameengine/Ketsji/KX_SteeringActuator.cpp
2011-10-09 04:11:18 UTC (rev 40871)
@@ -46,38 +46,38 @@
/* ------------------------------------------------------------------------- */
KX_SteeringActuator::KX_SteeringActuator(SCA_IObject *gameobj,
- int
mode,
-
KX_GameObject *target,
-
KX_GameObject *navmesh,
- float
distance,
- float
velocity,
- float
acceleration,
- float
turnspeed,
- bool
isSelfTerminated,
- int
pathUpdatePeriod,
-
KX_ObstacleSimulation* simulation,
- short
facingmode,
- bool
normalup,
- bool
enableVisualization) :
- SCA_IActuator(gameobj, KX_ACT_STEERING),
- m_mode(mode),
- m_target(target),
- m_distance(distance),
- m_velocity(velocity),
- m_acceleration(acceleration),
- m_turnspeed(turnspeed),
- m_isSelfTerminated(isSelfTerminated),
- m_pathUpdatePeriod(pathUpdatePeriod),
- m_updateTime(0),
- m_isActive(false),
- m_simulation(simulation),
- m_enableVisualization(enableVisualization),
- m_facingMode(facingmode),
- m_normalUp(normalup),
- m_obstacle(NULL),
- m_pathLen(0),
- m_wayPointIdx(-1),
- m_steerVec(MT_Vector3(0, 0, 0))
+ int mode,
+ KX_GameObject *target,
+ KX_GameObject *navmesh,
+ float distance,
+ float velocity,
+ float acceleration,
+ float turnspeed,
+ bool isSelfTerminated,
+ int pathUpdatePeriod,
+ KX_ObstacleSimulation* simulation,
+ short facingmode,
+ bool normalup,
+ bool enableVisualization)
+ : SCA_IActuator(gameobj, KX_ACT_STEERING),
+ m_target(target),
+ m_mode(mode),
+ m_distance(distance),
+ m_velocity(velocity),
+ m_acceleration(acceleration),
+ m_turnspeed(turnspeed),
+ m_simulation(simulation),
+ m_updateTime(0),
+ m_obstacle(NULL),
+ m_isActive(false),
+ m_isSelfTerminated(isSelfTerminated),
+ m_enableVisualization(enableVisualization),
+ m_facingMode(facingmode),
+ m_normalUp(normalup),
+ m_pathLen(0),
+ m_pathUpdatePeriod(pathUpdatePeriod),
+ m_wayPointIdx(-1),
+ m_steerVec(MT_Vector3(0, 0, 0))
{
m_navmesh = static_cast<KX_NavMeshObject*>(navmesh);
if (m_navmesh)
Modified: trunk/blender/source/gameengine/Ketsji/KX_SteeringActuator.h
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_SteeringActuator.h
2011-10-09 03:05:36 UTC (rev 40870)
+++ trunk/blender/source/gameengine/Ketsji/KX_SteeringActuator.h
2011-10-09 04:11:18 UTC (rev 40871)
@@ -56,12 +56,12 @@
int m_mode;
float m_distance;
float m_velocity;
- float m_acceleration;
+ float m_acceleration;
float m_turnspeed;
KX_ObstacleSimulation* m_simulation;
+ double m_updateTime;
KX_Obstacle* m_obstacle;
- double m_updateTime;
bool m_isActive;
bool m_isSelfTerminated;
bool m_enableVisualization;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
