Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/gameengine/Expressions/VectorValue.cpp')
-rw-r--r--source/gameengine/Expressions/VectorValue.cpp51
1 files changed, 25 insertions, 26 deletions
diff --git a/source/gameengine/Expressions/VectorValue.cpp b/source/gameengine/Expressions/VectorValue.cpp
index ed13b0c8639..612de658ce9 100644
--- a/source/gameengine/Expressions/VectorValue.cpp
+++ b/source/gameengine/Expressions/VectorValue.cpp
@@ -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());
}