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

I'll break this commit into two sections in the moto files

Browse Source 
I got rid of a few warnings about blah shadows a previous declaration.

In the gameengine files I fix the following:
	removed some unused vars
	removed dos style line breaks
	added newlines to last line in a couple of files to remove warnings.

Kent
This commit is contained in:
Kent Mein 2005-03-25 16:31:05 +00:00
parent 589240926b
commit 55af35d795
8 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
intern/moto/include/MT_Point2.h
View File

@ -51,9 +51,9 @@
class MT_Point2 : public MT_Vector2 {
public:
MT_Point2() {}
MT_Point2(const float *v) : MT_Vector2(v) {}
MT_Point2(const double *v) : MT_Vector2(v) {}
MT_Point2(MT_Scalar x, MT_Scalar y) : MT_Vector2(x, y) {}
MT_Point2(const float *v2) : MT_Vector2(v2) {}
MT_Point2(const double *v2) : MT_Vector2(v2) {}
MT_Point2(MT_Scalar x2, MT_Scalar y2) : MT_Vector2(x2, y2) {}
MT_Point2& operator+=(const MT_Vector2& v);
MT_Point2& operator-=(const MT_Vector2& v);

4
intern/moto/include/MT_Vector2.h
View File

@ -52,8 +52,8 @@
class MT_Vector2 : public MT_Tuple2 {
public:
MT_Vector2() {}
MT_Vector2(const float *v) : MT_Tuple2(v) {}
MT_Vector2(const double *v) : MT_Tuple2(v) {}
MT_Vector2(const float *v2) : MT_Tuple2(v2) {}
MT_Vector2(const double *v2) : MT_Tuple2(v2) {}
MT_Vector2(MT_Scalar xx, MT_Scalar yy) : MT_Tuple2(xx, yy) {}
MT_Vector2& operator+=(const MT_Vector2& v);

1
source/gameengine/Converter/KX_BlenderSceneConverter.cpp
View File

@ -177,7 +177,6 @@ void KX_BlenderSceneConverter::ConvertScene(const STR_String& scenename,
if (blenderscene)
{
int i=0;
if (blenderscene->world)
{

5
source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
View File

@ -31,10 +31,6 @@
* KX_MouseFocusSensor determines mouse in/out/over events.
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#ifdef WIN32
// This warning tells us about truncation of __long__ stl-generated names.
// It can occasionally cause DevStudio to have internal compiler warnings.
@ -152,7 +148,6 @@ bool KX_MouseFocusSensor::RayHit(KX_ClientObjectInfo* client_info, MT_Point3& hi
bool KX_MouseFocusSensor::ParentObjectHasFocus(void)
{
bool res = false;
m_hitPosition = MT_Vector3(0,0,0);
m_hitNormal = MT_Vector3(1,0,0);
MT_Point3 resultpoint;

2
source/gameengine/Physics/Sumo/SumoPHYCallbackBridge.cpp
View File

@ -62,5 +62,5 @@ DT_Bool SumoPHYCallbackBridge::SolidToPHY(void *client_object1,
return m_phyCallback(m_orgClientData,
ctrl1,ctrl2,0);
}
}

3
source/gameengine/Physics/Sumo/SumoPHYCallbackBridge.h
View File

@ -24,4 +24,5 @@ public:
};
#endif //SUMO_PHY_CALLBACK_BRIDGE_H
#endif //SUMO_PHY_CALLBACK_BRIDGE_H

4
source/gameengine/Physics/Sumo/SumoPhysicsController.cpp
View File

@ -36,10 +36,6 @@
#include "MT_Quaternion.h"
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
SumoPhysicsController::SumoPhysicsController(
class SM_Scene* sumoScene,
class SM_Object* sumoObj,

7
source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.cpp
View File

@ -36,11 +36,6 @@
#include "SumoPHYCallbackBridge.h"
#include <SOLID/SOLID.h>
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
SumoPhysicsEnvironment::SumoPhysicsEnvironment()
{
m_fixedTimeStep = 1.f/60.f;
@ -101,7 +96,6 @@ bool SumoPhysicsEnvironment::proceedDeltaTime(double curTime,float timeStep)
} else
{
m_currentTime += timeStep;
float ticrate = 1.f/timeStep;
result = m_sumoScene->proceed(m_currentTime, timeStep);
}
return result;
@ -257,4 +251,3 @@ PHY_IPhysicsController* SumoPhysicsEnvironment::CreateConeController(float coner
return ctrl;
}