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-10-29 06:11:40 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-10-29 06:11:40 +0400
commit5549904171bd052b2b355e77b3582fd1e4b0a320 (patch)
treea38c4d30bfa126e671c80243a6695ea765b0a278 /source/gameengine/Ketsji
parentdd106b5c7a129e00bebe121c4da8cb90a16d48cb (diff)
style cleanup
Diffstat (limited to 'source/gameengine/Ketsji')
-rw-r--r--source/gameengine/Ketsji/KX_BlenderMaterial.cpp10
-rw-r--r--source/gameengine/Ketsji/KX_Camera.cpp26
-rw-r--r--source/gameengine/Ketsji/KX_Camera.h2
-rw-r--r--source/gameengine/Ketsji/KX_IPOTransform.h4
-rw-r--r--source/gameengine/Ketsji/KX_MouseFocusSensor.h12
-rw-r--r--source/gameengine/Ketsji/KX_PythonInit.cpp4
6 files changed, 29 insertions, 29 deletions
diff --git a/source/gameengine/Ketsji/KX_BlenderMaterial.cpp b/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
index da6fd822a6b..2154beeb205 100644
--- a/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
+++ b/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
@@ -165,11 +165,11 @@ void KX_BlenderMaterial::InitTextures()
continue;
}
if (!mTextures[i].InitCubeMap(i, mMaterial->cubemap[i] ) )
- spit("unable to initialize image("<<i<<") in "<<
- mMaterial->matname<< ", image will not be available");
- }
- // If we're using glsl materials, the textures are handled by bf_gpu, so don't load them twice!
- // However, if we're using a custom shader, then we still need to load the textures ourselves.
+ spit("unable to initialize image("<<i<<") in "<<
+ mMaterial->matname<< ", image will not be available");
+ }
+ /* If we're using glsl materials, the textures are handled by bf_gpu, so don't load them twice!
+ * However, if we're using a custom shader, then we still need to load the textures ourselves. */
else if (!mMaterial->glslmat || mShader) {
if ( mMaterial->img[i] ) {
if ( ! mTextures[i].InitFromImage(i, mMaterial->img[i], (mMaterial->flag[i] &MIPMAP)!=0 ))
diff --git a/source/gameengine/Ketsji/KX_Camera.cpp b/source/gameengine/Ketsji/KX_Camera.cpp
index 3cc51361788..39b0a24865e 100644
--- a/source/gameengine/Ketsji/KX_Camera.cpp
+++ b/source/gameengine/Ketsji/KX_Camera.cpp
@@ -38,19 +38,19 @@
#include "KX_Python.h"
#include "KX_PyMath.h"
KX_Camera::KX_Camera(void* sgReplicationInfo,
- SG_Callbacks callbacks,
- const RAS_CameraData& camdata,
- bool frustum_culling,
- bool delete_node)
- :
- KX_GameObject(sgReplicationInfo,callbacks),
- m_camdata(camdata),
- m_dirty(true),
- m_normalized(false),
- m_frustum_culling(frustum_culling),
- m_set_projection_matrix(false),
- m_set_frustum_center(false),
- m_delete_node(delete_node)
+ SG_Callbacks callbacks,
+ const RAS_CameraData& camdata,
+ bool frustum_culling,
+ bool delete_node)
+ :
+ KX_GameObject(sgReplicationInfo,callbacks),
+ m_camdata(camdata),
+ m_dirty(true),
+ m_normalized(false),
+ m_frustum_culling(frustum_culling),
+ m_set_projection_matrix(false),
+ m_set_frustum_center(false),
+ m_delete_node(delete_node)
{
// setting a name would be nice...
m_name = "cam";
diff --git a/source/gameengine/Ketsji/KX_Camera.h b/source/gameengine/Ketsji/KX_Camera.h
index 6c1dc1edb51..f615fefc223 100644
--- a/source/gameengine/Ketsji/KX_Camera.h
+++ b/source/gameengine/Ketsji/KX_Camera.h
@@ -120,7 +120,7 @@ protected:
/**
* whether the camera should delete the node itself (only for shadow camera)
*/
- bool m_delete_node;
+ bool m_delete_node;
/**
* Extracts the camera clip frames from the projection and world-to-camera matrices.
diff --git a/source/gameengine/Ketsji/KX_IPOTransform.h b/source/gameengine/Ketsji/KX_IPOTransform.h
index 43019f3e54a..a68292bf9df 100644
--- a/source/gameengine/Ketsji/KX_IPOTransform.h
+++ b/source/gameengine/Ketsji/KX_IPOTransform.h
@@ -48,8 +48,8 @@ public:
MT_Transform GetTransform() const {
return MT_Transform(m_position + m_deltaPosition,
- MT_Matrix3x3(m_eulerAngles + m_deltaEulerAngles,
- m_scaling + m_deltaScaling));
+ MT_Matrix3x3(m_eulerAngles + m_deltaEulerAngles,
+ m_scaling + m_deltaScaling));
}
MT_Point3& GetPosition() { return m_position; }
diff --git a/source/gameengine/Ketsji/KX_MouseFocusSensor.h b/source/gameengine/Ketsji/KX_MouseFocusSensor.h
index a8376dcb4fb..1f7809831e7 100644
--- a/source/gameengine/Ketsji/KX_MouseFocusSensor.h
+++ b/source/gameengine/Ketsji/KX_MouseFocusSensor.h
@@ -151,27 +151,27 @@ class KX_MouseFocusSensor : public SCA_MouseSensor
/**
* (in game world coordinates) the place where the object was hit.
*/
- MT_Point3 m_hitPosition;
+ MT_Point3 m_hitPosition;
/**
* (in game world coordinates) the position to which to shoot the ray.
*/
- MT_Point3 m_prevTargetPoint;
+ MT_Point3 m_prevTargetPoint;
/**
* (in game world coordinates) the position from which to shoot the ray.
*/
- MT_Point3 m_prevSourcePoint;
-
+ MT_Point3 m_prevSourcePoint;
+
/**
* (in game world coordinates) the face normal of the vertex where
* the object was hit. */
- MT_Vector3 m_hitNormal;
+ MT_Vector3 m_hitNormal;
/**
* UV texture coordinate of the hit point if any, (0,0) otherwise
*/
- MT_Vector2 m_hitUV;
+ MT_Vector2 m_hitUV;
/**
* The KX scene that holds the camera. The camera position
diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp
index 2c147528bcb..7fa5138de0b 100644
--- a/source/gameengine/Ketsji/KX_PythonInit.cpp
+++ b/source/gameengine/Ketsji/KX_PythonInit.cpp
@@ -180,8 +180,8 @@ void KX_RasterizerDrawDebugLine(const MT_Vector3& from,const MT_Vector3& to,cons
gp_Rasterizer->DrawDebugLine(from,to,color);
}
-void KX_RasterizerDrawDebugCircle(const MT_Vector3& center, const MT_Scalar radius, const MT_Vector3& color,
- const MT_Vector3& normal, int nsector)
+void KX_RasterizerDrawDebugCircle(const MT_Vector3& center, const MT_Scalar radius, const MT_Vector3& color,
+ const MT_Vector3& normal, int nsector)
{
if (gp_Rasterizer)
gp_Rasterizer->DrawDebugCircle(center, radius, color, normal, nsector);