Revision: 19107
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19107
Author: campbellbarton
Date: 2009-02-25 04:26:02 +0100 (Wed, 25 Feb 2009)
Log Message:
-----------
remove warnings for the BGE
- variables that shadow vers declared earlier
- Py_Fatal print an error to the stderr
- gcc was complaining about the order of initialized vars (for classes)
- const return values for ints and bools didnt do anything.
- braces for ambiguous if statements
Modified Paths:
--------------
trunk/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
trunk/blender/source/gameengine/Converter/KX_IpoConvert.cpp
trunk/blender/source/gameengine/Expressions/InputParser.cpp
trunk/blender/source/gameengine/Expressions/PyObjectPlus.cpp
trunk/blender/source/gameengine/Expressions/PyObjectPlus.h
trunk/blender/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
trunk/blender/source/gameengine/GameLogic/SCA_DelaySensor.cpp
trunk/blender/source/gameengine/GameLogic/SCA_IActuator.cpp
trunk/blender/source/gameengine/GameLogic/SCA_IActuator.h
trunk/blender/source/gameengine/GameLogic/SCA_IController.cpp
trunk/blender/source/gameengine/GameLogic/SCA_IObject.cpp
trunk/blender/source/gameengine/GameLogic/SCA_MouseSensor.cpp
trunk/blender/source/gameengine/Ketsji/BL_Shader.cpp
trunk/blender/source/gameengine/Ketsji/BL_Shader.h
trunk/blender/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
trunk/blender/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
trunk/blender/source/gameengine/Ketsji/KX_GameActuator.cpp
trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp
trunk/blender/source/gameengine/Ketsji/KX_IPO_SGController.cpp
trunk/blender/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
trunk/blender/source/gameengine/Ketsji/KX_NearSensor.cpp
trunk/blender/source/gameengine/Ketsji/KX_ObjectActuator.cpp
trunk/blender/source/gameengine/Ketsji/KX_PolyProxy.cpp
trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
trunk/blender/source/gameengine/Ketsji/KX_SoundActuator.cpp
trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
trunk/blender/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
trunk/blender/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
trunk/blender/source/gameengine/Rasterizer/RAS_TexVert.h
trunk/blender/source/gameengine/VideoTexture/FilterBase.cpp
trunk/blender/source/gameengine/VideoTexture/FilterSource.h
Modified:
trunk/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
===================================================================
--- trunk/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
2009-02-24 21:25:36 UTC (rev 19106)
+++ trunk/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
2009-02-25 03:26:02 UTC (rev 19107)
@@ -563,10 +563,12 @@
// get some preferences
SYS_SystemHandle syshandle = SYS_GetSystem();
+ /*
bool properties = (SYS_GetCommandLineInt(syshandle,
"show_properties", 0) != 0);
bool usefixed = (SYS_GetCommandLineInt(syshandle, "fixedtime",
0) != 0);
bool profile = (SYS_GetCommandLineInt(syshandle,
"show_profile", 0) != 0);
bool frameRate = (SYS_GetCommandLineInt(syshandle,
"show_framerate", 0) != 0);
+ */
bool game2ipo = true;//(SYS_GetCommandLineInt(syshandle,
"game2ipo", 0) != 0);
bool displaylists = (SYS_GetCommandLineInt(syshandle,
"displaylists", 0) != 0);
bool usemat = false;
Modified: trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
===================================================================
--- trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
2009-02-24 21:25:36 UTC (rev 19106)
+++ trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
2009-02-25 03:26:02 UTC (rev 19107)
@@ -1997,18 +1997,18 @@
MT_Vector3 x(ori.getColumn(0));
MT_Vector3 y(ori.getColumn(1));
MT_Vector3 z(ori.getColumn(2));
- MT_Vector3 scale(x.length(), y.length(),
z.length());
- if (!MT_fuzzyZero(scale[0]))
- x /= scale[0];
- if (!MT_fuzzyZero(scale[1]))
- y /= scale[1];
- if (!MT_fuzzyZero(scale[2]))
- z /= scale[2];
+ MT_Vector3 parscale(x.length(), y.length(),
z.length());
+ if (!MT_fuzzyZero(parscale[0]))
+ x /= parscale[0];
+ if (!MT_fuzzyZero(parscale[1]))
+ y /= parscale[1];
+ if (!MT_fuzzyZero(parscale[2]))
+ z /= parscale[2];
ori.setColumn(0, x);
ori.setColumn(1, y);
ori.setColumn(2, z);
parentinversenode->SetLocalOrientation(ori);
- parentinversenode->SetLocalScale(scale);
+ parentinversenode->SetLocalScale(parscale);
parentinversenode->AddChild(gameobj->GetSGNode());
}
@@ -2194,18 +2194,18 @@
MT_Vector3
x(ori.getColumn(0));
MT_Vector3
y(ori.getColumn(1));
MT_Vector3
z(ori.getColumn(2));
- MT_Vector3
scale(x.length(), y.length(), z.length());
- if
(!MT_fuzzyZero(scale[0]))
- x /=
scale[0];
- if
(!MT_fuzzyZero(scale[1]))
- y /=
scale[1];
- if
(!MT_fuzzyZero(scale[2]))
- z /=
scale[2];
+ MT_Vector3
localscale(x.length(), y.length(), z.length());
+ if
(!MT_fuzzyZero(localscale[0]))
+ x /=
localscale[0];
+ if
(!MT_fuzzyZero(localscale[1]))
+ y /=
localscale[1];
+ if
(!MT_fuzzyZero(localscale[2]))
+ z /=
localscale[2];
ori.setColumn(0, x);
ori.setColumn(1, y);
ori.setColumn(2, z);
parentinversenode->SetLocalOrientation(ori);
-
parentinversenode->SetLocalScale(scale);
+
parentinversenode->SetLocalScale(localscale);
parentinversenode->AddChild(gameobj->GetSGNode());
}
Modified: trunk/blender/source/gameengine/Converter/KX_IpoConvert.cpp
===================================================================
--- trunk/blender/source/gameengine/Converter/KX_IpoConvert.cpp 2009-02-24
21:25:36 UTC (rev 19106)
+++ trunk/blender/source/gameengine/Converter/KX_IpoConvert.cpp 2009-02-25
03:26:02 UTC (rev 19107)
@@ -311,67 +311,67 @@
}
{
- KX_ObColorIpoSGController* ipocontr=NULL;
+ KX_ObColorIpoSGController* ipocontr_obcol=NULL;
ipo = ipoList->GetScalarInterpolator(OB_COL_R);
if (ipo)
{
- if (!ipocontr)
+ if (!ipocontr_obcol)
{
- ipocontr = new
KX_ObColorIpoSGController();
-
gameobj->GetSGNode()->AddSGController(ipocontr);
-
ipocontr->SetObject(gameobj->GetSGNode());
+ ipocontr_obcol = new
KX_ObColorIpoSGController();
+
gameobj->GetSGNode()->AddSGController(ipocontr_obcol);
+
ipocontr_obcol->SetObject(gameobj->GetSGNode());
}
KX_IInterpolator *interpolator =
new KX_ScalarInterpolator(
- &ipocontr->m_rgba[0],
+ &ipocontr_obcol->m_rgba[0],
ipo);
- ipocontr->AddInterpolator(interpolator);
+ ipocontr_obcol->AddInterpolator(interpolator);
}
ipo = ipoList->GetScalarInterpolator(OB_COL_G);
if (ipo)
{
- if (!ipocontr)
+ if (!ipocontr_obcol)
{
- ipocontr = new
KX_ObColorIpoSGController();
-
gameobj->GetSGNode()->AddSGController(ipocontr);
-
ipocontr->SetObject(gameobj->GetSGNode());
+ ipocontr_obcol = new
KX_ObColorIpoSGController();
+
gameobj->GetSGNode()->AddSGController(ipocontr_obcol);
+
ipocontr_obcol->SetObject(gameobj->GetSGNode());
}
KX_IInterpolator *interpolator =
new KX_ScalarInterpolator(
- &ipocontr->m_rgba[1],
+ &ipocontr_obcol->m_rgba[1],
ipo);
- ipocontr->AddInterpolator(interpolator);
+ ipocontr_obcol->AddInterpolator(interpolator);
}
ipo = ipoList->GetScalarInterpolator(OB_COL_B);
if (ipo)
{
- if (!ipocontr)
+ if (!ipocontr_obcol)
{
- ipocontr = new
KX_ObColorIpoSGController();
-
gameobj->GetSGNode()->AddSGController(ipocontr);
-
ipocontr->SetObject(gameobj->GetSGNode());
+ ipocontr_obcol = new
KX_ObColorIpoSGController();
+
gameobj->GetSGNode()->AddSGController(ipocontr_obcol);
+
ipocontr_obcol->SetObject(gameobj->GetSGNode());
}
KX_IInterpolator *interpolator =
new KX_ScalarInterpolator(
- &ipocontr->m_rgba[2],
+ &ipocontr_obcol->m_rgba[2],
ipo);
- ipocontr->AddInterpolator(interpolator);
+ ipocontr_obcol->AddInterpolator(interpolator);
}
ipo = ipoList->GetScalarInterpolator(OB_COL_A);
if (ipo)
{
- if (!ipocontr)
+ if (!ipocontr_obcol)
{
- ipocontr = new
KX_ObColorIpoSGController();
-
gameobj->GetSGNode()->AddSGController(ipocontr);
-
ipocontr->SetObject(gameobj->GetSGNode());
+ ipocontr_obcol = new
KX_ObColorIpoSGController();
+
gameobj->GetSGNode()->AddSGController(ipocontr_obcol);
+
ipocontr_obcol->SetObject(gameobj->GetSGNode());
}
KX_IInterpolator *interpolator =
new KX_ScalarInterpolator(
- &ipocontr->m_rgba[3],
+ &ipocontr_obcol->m_rgba[3],
ipo);
- ipocontr->AddInterpolator(interpolator);
+ ipocontr_obcol->AddInterpolator(interpolator);
}
}
Modified: trunk/blender/source/gameengine/Expressions/InputParser.cpp
===================================================================
--- trunk/blender/source/gameengine/Expressions/InputParser.cpp 2009-02-24
21:25:36 UTC (rev 19106)
+++ trunk/blender/source/gameengine/Expressions/InputParser.cpp 2009-02-25
03:26:02 UTC (rev 19107)
@@ -274,7 +274,7 @@
} else if (((ch >= 'a') && (ch <= 'z'))
|| ((ch >= 'A') && (ch <= 'Z')))
{ // reserved word?
- int start;
+
start = chcount;
CharRep();
GrabString(start);
Modified: trunk/blender/source/gameengine/Expressions/PyObjectPlus.cpp
===================================================================
--- trunk/blender/source/gameengine/Expressions/PyObjectPlus.cpp
2009-02-24 21:25:36 UTC (rev 19106)
+++ trunk/blender/source/gameengine/Expressions/PyObjectPlus.cpp
2009-02-25 03:26:02 UTC (rev 19107)
@@ -147,7 +147,7 @@
if (attrdef->m_length > 1)
{
PyObject* resultlist =
PyList_New(attrdef->m_length);
- for (int i=0; i<attrdef->m_length; i++)
+ for (unsigned int i=0; i<attrdef->m_length; i++)
{
switch (attrdef->m_type) {
case KX_PYATTRIBUTE_TYPE_BOOL:
Modified: trunk/blender/source/gameengine/Expressions/PyObjectPlus.h
===================================================================
--- trunk/blender/source/gameengine/Expressions/PyObjectPlus.h 2009-02-24
21:25:36 UTC (rev 19106)
+++ trunk/blender/source/gameengine/Expressions/PyObjectPlus.h 2009-02-25
03:26:02 UTC (rev 19107)
@@ -73,7 +73,7 @@
#endif
static inline void Py_Fatal(const char *M) {
- //cout << M << endl;
+ fprintf(stderr, "%s\n", M);
exit(-1);
};
Modified: trunk/blender/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
===================================================================
--- trunk/blender/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
2009-02-24 21:25:36 UTC (rev 19106)
+++ trunk/blender/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
2009-02-25 03:26:02 UTC (rev 19107)
@@ -42,14 +42,14 @@
m_axis21(0),
m_prec(3200),
m_buttonnum(-2),
+ m_axismax(-1),
m_hatdir(-2),
+ m_buttonmax(-1),
+ m_hatmax(-1),
m_isinit(0),
m_istrig_axis(0),
m_istrig_button(0),
- m_istrig_hat(0),
- m_axismax(-1),
- m_buttonmax(-1),
- m_hatmax(-1)
+ m_istrig_hat(0)
{
#ifndef DISABLE_SDL
m_private = new PrivateData();
Modified: trunk/blender/source/gameengine/GameLogic/SCA_DelaySensor.cpp
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_DelaySensor.cpp
2009-02-24 21:25:36 UTC (rev 19106)
+++ trunk/blender/source/gameengine/GameLogic/SCA_DelaySensor.cpp
2009-02-25 03:26:02 UTC (rev 19107)
@@ -53,10 +53,10 @@
int duration,
bool repeat,
PyTypeObject*
T)
- : SCA_ISensor(gameobj,eventmgr, T),
+ : SCA_ISensor(gameobj,eventmgr, T),
+ m_repeat(repeat),
m_delay(delay),
- m_duration(duration),
- m_repeat(repeat)
+ m_duration(duration)
{
Init();
}
Modified: trunk/blender/source/gameengine/GameLogic/SCA_IActuator.cpp
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_IActuator.cpp 2009-02-24
21:25:36 UTC (rev 19106)
+++ trunk/blender/source/gameengine/GameLogic/SCA_IActuator.cpp 2009-02-25
03:26:02 UTC (rev 19107)
@@ -36,8 +36,8 @@
SCA_IActuator::SCA_IActuator(SCA_IObject* gameobj,
PyTypeObject* T) :
- m_links(0),
- SCA_ILogicBrick(gameobj,T)
+ SCA_ILogicBrick(gameobj,T),
+ m_links(0)
{
// nothing to do
}
Modified: trunk/blender/source/gameengine/GameLogic/SCA_IActuator.h
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_IActuator.h 2009-02-24
21:25:36 UTC (rev 19106)
+++ trunk/blender/source/gameengine/GameLogic/SCA_IActuator.h 2009-02-25
03:26:02 UTC (rev 19107)
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
