Revision: 39834
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39834
Author: campbellbarton
Date: 2011-09-01 02:12:53 +0000 (Thu, 01 Sep 2011)
Log Message:
-----------
whitespace bge edits
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
trunk/blender/source/gameengine/Converter/BL_ShapeDeformer.cpp
trunk/blender/source/gameengine/Converter/BlenderWorldInfo.cpp
trunk/blender/source/gameengine/Converter/KX_ConvertActuators.cpp
trunk/blender/source/gameengine/Converter/KX_ConvertSensors.cpp
trunk/blender/source/gameengine/Expressions/InputParser.cpp
trunk/blender/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
trunk/blender/source/gameengine/GameLogic/SCA_ISensor.cpp
trunk/blender/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
trunk/blender/source/gameengine/GameLogic/SCA_MouseSensor.cpp
trunk/blender/source/gameengine/GameLogic/SCA_RandomNumberGenerator.cpp
trunk/blender/source/gameengine/GameLogic/SCA_RandomSensor.cpp
trunk/blender/source/gameengine/GameLogic/SCA_XORController.cpp
trunk/blender/source/gameengine/GamePlayer/common/bmfont.cpp
trunk/blender/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
trunk/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
trunk/blender/source/gameengine/Ketsji/BL_BlenderShader.cpp
trunk/blender/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.cpp
trunk/blender/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
trunk/blender/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
trunk/blender/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
trunk/blender/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
trunk/blender/source/gameengine/Ketsji/KX_Camera.cpp
trunk/blender/source/gameengine/Ketsji/KX_Dome.cpp
trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp
trunk/blender/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
trunk/blender/source/gameengine/Ketsji/KX_Light.cpp
trunk/blender/source/gameengine/Ketsji/KX_MeshProxy.cpp
trunk/blender/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
trunk/blender/source/gameengine/Ketsji/KX_RaySensor.cpp
trunk/blender/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.cpp
trunk/blender/source/gameengine/Ketsji/KX_TrackToActuator.cpp
trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
trunk/blender/source/gameengine/SceneGraph/SG_BBox.cpp
trunk/blender/source/gameengine/SceneGraph/SG_Spatial.cpp
trunk/blender/source/gameengine/VideoTexture/Exception.cpp
trunk/blender/source/gameengine/VideoTexture/ImageBase.cpp
trunk/blender/source/gameengine/VideoTexture/ImageRender.cpp
trunk/blender/source/gameengine/VideoTexture/ImageViewport.cpp
trunk/blender/source/gameengine/VideoTexture/VideoFFmpeg.cpp
trunk/blender/source/gameengine/VideoTexture/blendVideoTex.cpp
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2011-09-01 01:48:50 UTC (rev 39833)
+++ trunk/blender/CMakeLists.txt 2011-09-01 02:12:53 UTC (rev 39834)
@@ -948,7 +948,7 @@
# we use precompiled libraries for py 3.2 and up by default
# normally cached but not since we include them with blender
- set(PYTHON_VERSION 3.2)
+ set(PYTHON_VERSION 3.2)
set(PYTHON_INCLUDE_DIR
"${LIBDIR}/python/include/python${PYTHON_VERSION}")
# set(PYTHON_BINARY
"${LIBDIR}/python/bin/python${PYTHON_VERSION}") # not used yet
set(PYTHON_LIBRARY python${PYTHON_VERSION})
Modified: trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
===================================================================
--- trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
2011-09-01 01:48:50 UTC (rev 39833)
+++ trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
2011-09-01 02:12:53 UTC (rev 39834)
@@ -1911,11 +1911,11 @@
KX_IPhysicsController* getPhId(CListValue* sumolist,STR_String busc){//not used
- for (int j=0;j<sumolist->GetCount();j++)
+ for (int j=0;j<sumolist->GetCount();j++)
{
- KX_GameObject* gameobje = (KX_GameObject*) sumolist->GetValue(j);
- if (gameobje->GetName()==busc)
- return gameobje->GetPhysicsController();
+ KX_GameObject* gameobje = (KX_GameObject*)
sumolist->GetValue(j);
+ if (gameobje->GetName()==busc)
+ return gameobje->GetPhysicsController();
}
return 0;
@@ -1924,11 +1924,11 @@
KX_GameObject* getGameOb(STR_String busc,CListValue* sumolist){
- for (int j=0;j<sumolist->GetCount();j++)
+ for (int j=0;j<sumolist->GetCount();j++)
{
- KX_GameObject* gameobje = (KX_GameObject*) sumolist->GetValue(j);
- if (gameobje->GetName()==busc)
- return gameobje;
+ KX_GameObject* gameobje = (KX_GameObject*)
sumolist->GetValue(j);
+ if (gameobje->GetName()==busc)
+ return gameobje;
}
return 0;
@@ -2629,7 +2629,7 @@
{
PHY_IPhysicsController*
physctrl = (PHY_IPhysicsController*)
gameobj->GetPhysicsController()->GetUserData();
//we need to pass a
full constraint frame, not just axis
-
+
//localConstraintFrameBasis
MT_Matrix3x3
localCFrame(MT_Vector3(dat->axX,dat->axY,dat->axZ));
MT_Vector3 axis0 =
localCFrame.getColumn(0);
Modified: trunk/blender/source/gameengine/Converter/BL_ShapeDeformer.cpp
===================================================================
--- trunk/blender/source/gameengine/Converter/BL_ShapeDeformer.cpp
2011-09-01 01:48:50 UTC (rev 39833)
+++ trunk/blender/source/gameengine/Converter/BL_ShapeDeformer.cpp
2011-09-01 02:12:53 UTC (rev 39834)
@@ -69,12 +69,12 @@
//#undef __NLA_DEFNORMALS
BL_ShapeDeformer::BL_ShapeDeformer(BL_DeformableGameObject *gameobj,
- Object *bmeshobj,
- RAS_MeshObject *mesh)
- :
- BL_SkinDeformer(gameobj,bmeshobj, mesh),
- m_useShapeDrivers(false),
- m_lastShapeUpdate(-1)
+ Object *bmeshobj,
+ RAS_MeshObject *mesh)
+ :
+ BL_SkinDeformer(gameobj,bmeshobj, mesh),
+ m_useShapeDrivers(false),
+ m_lastShapeUpdate(-1)
{
m_key = m_bmesh->key;
m_bmesh->key = copy_key(m_key);
Modified: trunk/blender/source/gameengine/Converter/BlenderWorldInfo.cpp
===================================================================
--- trunk/blender/source/gameengine/Converter/BlenderWorldInfo.cpp
2011-09-01 01:48:50 UTC (rev 39833)
+++ trunk/blender/source/gameengine/Converter/BlenderWorldInfo.cpp
2011-09-01 02:12:53 UTC (rev 39834)
@@ -170,10 +170,10 @@
float BlenderWorldInfo::getMistDistance()
{
return m_mistdistance;
-}
-
+}
-
+
+
float BlenderWorldInfo::getMistColorRed()
{
return m_mistcolor[0];
Modified: trunk/blender/source/gameengine/Converter/KX_ConvertActuators.cpp
===================================================================
--- trunk/blender/source/gameengine/Converter/KX_ConvertActuators.cpp
2011-09-01 01:48:50 UTC (rev 39833)
+++ trunk/blender/source/gameengine/Converter/KX_ConvertActuators.cpp
2011-09-01 02:12:53 UTC (rev 39834)
@@ -996,7 +996,7 @@
filtermode =
RAS_2DFilterManager::RAS_2DFILTER_NOFILTER;
break;
}
-
+
tmp = new SCA_2DFilterActuator(gameobj, filtermode,
_2dfilter->flag,
_2dfilter->float_arg,_2dfilter->int_arg,ketsjiEngine->GetRasterizer(),scene);
@@ -1012,8 +1012,8 @@
}
}
- baseact = tmp;
-
+ baseact = tmp;
+
}
break;
case ACT_PARENT:
Modified: trunk/blender/source/gameengine/Converter/KX_ConvertSensors.cpp
===================================================================
--- trunk/blender/source/gameengine/Converter/KX_ConvertSensors.cpp
2011-09-01 01:48:50 UTC (rev 39833)
+++ trunk/blender/source/gameengine/Converter/KX_ConvertSensors.cpp
2011-09-01 02:12:53 UTC (rev 39834)
@@ -276,7 +276,7 @@
gReverseKeyTranslateTable[ENDKEY ] =
SCA_IInputDevice::KX_ENDKEY;
}
- int executePriority = 0;
+ int executePriority = 0;
int uniqueint = 0;
int count = 0;
bSensor* sens = (bSensor*)blenderobject->sensors.first;
Modified: trunk/blender/source/gameengine/Expressions/InputParser.cpp
===================================================================
--- trunk/blender/source/gameengine/Expressions/InputParser.cpp 2011-09-01
01:48:50 UTC (rev 39833)
+++ trunk/blender/source/gameengine/Expressions/InputParser.cpp 2011-09-01
02:12:53 UTC (rev 39834)
@@ -192,89 +192,89 @@
switch(ch)
{
- case '(':
- sym = lbracksym; NextCh();
- break;
- case ')':
- sym = rbracksym; NextCh();
- break;
- case ',':
- sym = commasym; NextCh();
- break;
- case '%' :
- sym = opsym; opkind = OPmodulus; NextCh();
- break;
- case '+' :
- sym = opsym; opkind = OPplus; NextCh();
- break;
- case '-' :
- sym = opsym; opkind = OPminus; NextCh();
- break;
- case '*' :
- sym = opsym; opkind = OPtimes; NextCh();
- break;
- case '/' :
- sym = opsym; opkind = OPdivide; NextCh();
- break;
- case '&' :
- sym = opsym; opkind = OPand; NextCh(); TermChar('&');
- break;
- case '|' :
- sym = opsym; opkind = OPor; NextCh(); TermChar('|');
- break;
- case '=' :
- sym = opsym; opkind = OPequal; NextCh(); TermChar('=');
- break;
- case '!' :
- sym = opsym;
- NextCh();
- if (ch == '=')
- {
- opkind = OPunequal;
+ case '(':
+ sym = lbracksym; NextCh();
+ break;
+ case ')':
+ sym = rbracksym; NextCh();
+ break;
+ case ',':
+ sym = commasym; NextCh();
+ break;
+ case '%' :
+ sym = opsym; opkind = OPmodulus; NextCh();
+ break;
+ case '+' :
+ sym = opsym; opkind = OPplus; NextCh();
+ break;
+ case '-' :
+ sym = opsym; opkind = OPminus; NextCh();
+ break;
+ case '*' :
+ sym = opsym; opkind = OPtimes; NextCh();
+ break;
+ case '/' :
+ sym = opsym; opkind = OPdivide; NextCh();
+ break;
+ case '&' :
+ sym = opsym; opkind = OPand; NextCh(); TermChar('&');
+ break;
+ case '|' :
+ sym = opsym; opkind = OPor; NextCh(); TermChar('|');
+ break;
+ case '=' :
+ sym = opsym; opkind = OPequal; NextCh(); TermChar('=');
+ break;
+ case '!' :
+ sym = opsym;
NextCh();
- }
- else
- {
- opkind = OPnot;
- }
- break;
- case '>':
- sym = opsym;
- NextCh();
- if (ch == '=')
- {
- opkind = OPgreaterequal;
+ if (ch == '=')
+ {
+ opkind = OPunequal;
+ NextCh();
+ }
+ else
+ {
+ opkind = OPnot;
+ }
+ break;
+ case '>':
+ sym = opsym;
NextCh();
- }
- else
- {
- opkind = OPgreater;
- }
- break;
- case '<':
- sym = opsym;
- NextCh();
- if (ch == '=') {
- opkind = OPlessequal;
+ if (ch == '=')
+ {
+ opkind = OPgreaterequal;
+ NextCh();
+ }
+ else
+ {
+ opkind = OPgreater;
+ }
+ break;
+ case '<':
+ sym = opsym;
NextCh();
- } else {
- opkind = OPless;
+ if (ch == '=') {
+ opkind = OPlessequal;
+ NextCh();
+ } else {
+ opkind = OPless;
+ }
+ break;
+ case '\"' : {
+ int start;
+ sym = constsym;
+ constkind = stringtype;
+ NextCh();
+ start = chcount;
+ while ((ch != '\"') && (ch != 0x0))
+ NextCh();
+ GrabRealString(start);
+ TermChar('\"'); // check for eol before '\"'
+ break;
}
- break;
- case '\"' : {
- int start;
- sym = constsym;
- constkind = stringtype;
- NextCh();
- start = chcount;
- while ((ch != '\"') && (ch != 0x0))
- NextCh();
- GrabRealString(start);
- TermChar('\"'); // check for eol before '\"'
- break;
- }
- case 0x0: sym = eolsym; break;
- default:
+ case 0x0: sym = eolsym; break;
+ default:
{
int start;
start = chcount;
@@ -301,7 +301,7 @@
}
GrabString(start);
} else if (((ch >= 'a') && (ch <= 'z'))
- || ((ch >= 'A') && (ch <= 'Z')))
+ || ((ch >= 'A') && (ch <= 'Z')))
{ // reserved word?
start = chcount;
@@ -358,18 +358,18 @@
// returns a string representation of of symbol s,
// for use in Term when generating an error
switch(s) {
- case errorsym: return "error";
- case lbracksym: return "(";
- case rbracksym: return ")";
- case commasym: return ",";
- case opsym: return "operator";
- case constsym: return "constant";
- case sumsym: return "SUM";
- case ifsym: return "IF";
- case whocodedsym: return "WHOMADE";
- case eolsym: return "end of line";
- case idsym: return "identifier";
- default: return "unknown"; // should not happen
+ case errorsym: return "error";
+ case lbracksym: return "(";
+ case rbracksym: return ")";
+ case commasym: return ",";
+ case opsym: return "operator";
+ case constsym: return "constant";
+ case sumsym: return "SUM";
+ case ifsym: return "IF";
+ case whocodedsym: return "WHOMADE";
+ case eolsym: return "end of line";
+ case idsym: return "identifier";
+ default: return "unknown"; // should not happen
}
}
@@ -391,19 +391,19 @@
// returns the priority of an operator
// higher number means higher priority
switch(optorkind) {
- case OPor: return 1;
- case OPand: return 2;
- case OPgreater:
- case OPless:
- case OPgreaterequal:
- case OPlessequal:
- case OPequal:
- case OPunequal: return 3;
- case OPplus:
- case OPminus: return 4;
- case OPmodulus:
- case OPtimes:
- case OPdivide: return 5;
+ case OPor: return 1;
+ case OPand: return 2;
+ case OPgreater:
+ case OPless:
+ case OPgreaterequal:
+ case OPlessequal:
+ case OPequal:
+ case OPunequal: return 3;
+ case OPplus:
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
