griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

style cleanup: bge, switch statements mostly.

Browse Source 
also left bmesh decimator on in previous commit.
This commit is contained in:
Campbell Barton
2012-10-21 07:58:38 +00:00
parent f3ece5a108
commit d599b643b7
81 changed files with 893 additions and 920 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
source/gameengine/Expressions/VectorValue.cpp
View File

@@ -96,61 +96,60 @@ CValue* CVectorValue::CalcFinal(VALUE_DATA_TYPE dtype, VALUE_OPERATOR op, CValue
{
CValue *ret = NULL;
switch(op)
{
case VALUE_ADD_OPERATOR:
switch (op) {
case VALUE_ADD_OPERATOR:
{
switch (dtype)
{
case VALUE_EMPTY_TYPE:
case VALUE_VECTOR_TYPE:
case VALUE_EMPTY_TYPE:
case VALUE_VECTOR_TYPE:
{
ret = new CVectorValue(
val->GetVector3()[KX_X] + GetVector3()[KX_X],
val->GetVector3()[KX_Y] + GetVector3()[KX_Y],
val->GetVector3()[KX_Z] + GetVector3()[KX_Z],
CValue::HEAPVALUE);
val->GetVector3()[KX_X] + GetVector3()[KX_X],
val->GetVector3()[KX_Y] + GetVector3()[KX_Y],
val->GetVector3()[KX_Z] + GetVector3()[KX_Z],
CValue::HEAPVALUE);
ret->SetName(GetName());
break;
}
default:
ret = new CErrorValue(val->GetText() + op2str(op) + GetText());
default:
ret = new CErrorValue(val->GetText() + op2str(op) + GetText());
}
break;
}
case VALUE_MUL_OPERATOR:
case VALUE_MUL_OPERATOR:
{
switch (dtype)
{
case VALUE_EMPTY_TYPE:
case VALUE_VECTOR_TYPE:
case VALUE_EMPTY_TYPE:
case VALUE_VECTOR_TYPE:
{
//MT_Vector3 supports 'scaling' by another vector, instead of using general transform, Gino?
//ret = new CVectorValue(val->GetVector3().Scaled(GetVector3()),GetName());
break;
}
case VALUE_FLOAT_TYPE:
case VALUE_FLOAT_TYPE:
{
ret = new CVectorValue(
val->GetVector3()[KX_X] * GetVector3()[KX_X],
val->GetVector3()[KX_Y] * GetVector3()[KX_Y],
val->GetVector3()[KX_Z] * GetVector3()[KX_Z],
CValue::HEAPVALUE);
val->GetVector3()[KX_X] * GetVector3()[KX_X],
val->GetVector3()[KX_Y] * GetVector3()[KX_Y],
val->GetVector3()[KX_Z] * GetVector3()[KX_Z],
CValue::HEAPVALUE);
ret->SetName(GetName());
break;
}
default:
ret = new CErrorValue(val->GetText() + op2str(op) + GetText());
default:
ret = new CErrorValue(val->GetText() + op2str(op) + GetText());
}
break;
}
default:
ret = new CErrorValue(val->GetText() + op2str(op) + GetText());
default:
ret = new CErrorValue(val->GetText() + op2str(op) + GetText());
}