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:
authorCampbell Barton <ideasman42@gmail.com>2012-02-25 20:49:59 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-02-25 20:49:59 +0400
commit3fc2fbc333e47c2bbc3cabd33a2cd6ada3c714fd (patch)
treeab67acc5193277c5623863eb2bbf8a46ab69da00 /source/gameengine/Ketsji
parent6ca7d8293228e821695a3149e8fb91b0d305daeb (diff)
style cleanup, use { on newline after function definition.
spelling 'impliment' -> 'implement'
Diffstat (limited to 'source/gameengine/Ketsji')
-rw-r--r--source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp3
-rw-r--r--source/gameengine/Ketsji/KX_FontObject.cpp6
-rw-r--r--source/gameengine/Ketsji/KX_OrientationInterpolator.cpp3
-rw-r--r--source/gameengine/Ketsji/KX_PositionInterpolator.cpp3
-rw-r--r--source/gameengine/Ketsji/KX_ScalarInterpolator.cpp3
-rw-r--r--source/gameengine/Ketsji/KX_ScalingInterpolator.cpp3
6 files changed, 14 insertions, 7 deletions
diff --git a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
index f548eaee38a..a39c8ede6c1 100644
--- a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
+++ b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
@@ -72,7 +72,8 @@ KX_NetworkMessageSensor::~KX_NetworkMessageSensor()
{
}
-CValue* KX_NetworkMessageSensor::GetReplica() {
+CValue* KX_NetworkMessageSensor::GetReplica()
+{
// This is the standard sensor implementation of GetReplica
// There may be more network message sensor specific stuff to do here.
CValue* replica = new KX_NetworkMessageSensor(*this);
diff --git a/source/gameengine/Ketsji/KX_FontObject.cpp b/source/gameengine/Ketsji/KX_FontObject.cpp
index 519ff97a2a2..3739ad0d712 100644
--- a/source/gameengine/Ketsji/KX_FontObject.cpp
+++ b/source/gameengine/Ketsji/KX_FontObject.cpp
@@ -104,7 +104,8 @@ KX_FontObject::~KX_FontObject()
//it's handled in KX_Scene::NewRemoveObject
}
-CValue* KX_FontObject::GetReplica() {
+CValue* KX_FontObject::GetReplica()
+{
KX_FontObject* replica = new KX_FontObject(*this);
replica->ProcessReplica();
return replica;
@@ -116,7 +117,8 @@ void KX_FontObject::ProcessReplica()
KX_GetActiveScene()->AddFont(this);
}
-int GetFontId (VFont *font) {
+int GetFontId (VFont *font)
+{
PackedFile *packedfile=NULL;
int fontid = -1;
diff --git a/source/gameengine/Ketsji/KX_OrientationInterpolator.cpp b/source/gameengine/Ketsji/KX_OrientationInterpolator.cpp
index 4e0e04beca4..d2468d0317d 100644
--- a/source/gameengine/Ketsji/KX_OrientationInterpolator.cpp
+++ b/source/gameengine/Ketsji/KX_OrientationInterpolator.cpp
@@ -34,7 +34,8 @@
#include "MT_Matrix3x3.h"
#include "KX_IScalarInterpolator.h"
-void KX_OrientationInterpolator::Execute(float currentTime) const {
+void KX_OrientationInterpolator::Execute(float currentTime) const
+{
MT_Vector3 eul(m_ipos[0]->GetValue(currentTime),
m_ipos[1]->GetValue(currentTime),
m_ipos[2]->GetValue(currentTime));
diff --git a/source/gameengine/Ketsji/KX_PositionInterpolator.cpp b/source/gameengine/Ketsji/KX_PositionInterpolator.cpp
index be70ee8ced5..1e217ecf616 100644
--- a/source/gameengine/Ketsji/KX_PositionInterpolator.cpp
+++ b/source/gameengine/Ketsji/KX_PositionInterpolator.cpp
@@ -34,7 +34,8 @@
#include "MT_Point3.h"
#include "KX_IScalarInterpolator.h"
-void KX_PositionInterpolator::Execute(float currentTime) const {
+void KX_PositionInterpolator::Execute(float currentTime) const
+{
m_target.setValue(m_ipos[0]->GetValue(currentTime),
m_ipos[1]->GetValue(currentTime),
m_ipos[2]->GetValue(currentTime));
diff --git a/source/gameengine/Ketsji/KX_ScalarInterpolator.cpp b/source/gameengine/Ketsji/KX_ScalarInterpolator.cpp
index 2b0f112a63f..e234a9621b8 100644
--- a/source/gameengine/Ketsji/KX_ScalarInterpolator.cpp
+++ b/source/gameengine/Ketsji/KX_ScalarInterpolator.cpp
@@ -33,6 +33,7 @@
#include "KX_ScalarInterpolator.h"
#include "KX_IScalarInterpolator.h"
-void KX_ScalarInterpolator::Execute(float currentTime) const {
+void KX_ScalarInterpolator::Execute(float currentTime) const
+{
*m_target = m_ipo->GetValue(currentTime);
}
diff --git a/source/gameengine/Ketsji/KX_ScalingInterpolator.cpp b/source/gameengine/Ketsji/KX_ScalingInterpolator.cpp
index 51c2a87d14d..dd40cbd22fd 100644
--- a/source/gameengine/Ketsji/KX_ScalingInterpolator.cpp
+++ b/source/gameengine/Ketsji/KX_ScalingInterpolator.cpp
@@ -34,7 +34,8 @@
#include "MT_Vector3.h"
#include "KX_IScalarInterpolator.h"
-void KX_ScalingInterpolator::Execute(float currentTime) const {
+void KX_ScalingInterpolator::Execute(float currentTime) const
+{
m_target.setValue(m_ipos[0]->GetValue(currentTime),
m_ipos[1]->GetValue(currentTime),
m_ipos[2]->GetValue(currentTime));