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-07-22 02:58:08 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-07-22 02:58:08 +0400
commit9b515033071b40e982ef647ee225e8afc377e0c9 (patch)
treeb8906cf9d21d2441c6dd0db1b518561def3f8f1a /source/gameengine/VideoTexture
parent049dd8a0ffa94b0d02033877ec99172659b89d8c (diff)
style cleanup
Diffstat (limited to 'source/gameengine/VideoTexture')
-rw-r--r--source/gameengine/VideoTexture/ImageBase.cpp3
-rw-r--r--source/gameengine/VideoTexture/ImageRender.cpp19
-rw-r--r--source/gameengine/VideoTexture/Texture.cpp7
3 files changed, 14 insertions, 15 deletions
diff --git a/source/gameengine/VideoTexture/ImageBase.cpp b/source/gameengine/VideoTexture/ImageBase.cpp
index 090b4f6ff4a..54c1939ce6b 100644
--- a/source/gameengine/VideoTexture/ImageBase.cpp
+++ b/source/gameengine/VideoTexture/ImageBase.cpp
@@ -246,7 +246,8 @@ bool ImageBase::checkSourceSizes (void)
// set current size as reference
refSize = curSize;
// otherwise check with current size
- } else if (curSize[0] != refSize[0] || curSize[1] != refSize[1]) {
+ }
+ else if (curSize[0] != refSize[0] || curSize[1] != refSize[1]) {
// if they don't match, report it
return false;
}
diff --git a/source/gameengine/VideoTexture/ImageRender.cpp b/source/gameengine/VideoTexture/ImageRender.cpp
index 2cc2c6efa1e..9fdd0cd393b 100644
--- a/source/gameengine/VideoTexture/ImageRender.cpp
+++ b/source/gameengine/VideoTexture/ImageRender.cpp
@@ -208,11 +208,11 @@ void ImageRender::Render()
frustrum.x1, frustrum.x2, frustrum.y1, frustrum.y2, frustrum.camnear, frustrum.camfar);
m_camera->SetProjectionMatrix(projmat);
- } else if (m_camera->hasValidProjectionMatrix())
- {
+ }
+ else if (m_camera->hasValidProjectionMatrix()) {
m_rasterizer->SetProjectionMatrix(m_camera->GetProjectionMatrix());
- } else
- {
+ }
+ else {
float lens = m_camera->GetLens();
float sensor_x = m_camera->GetSensorWidth();
float sensor_y = m_camera->GetSensorHeight();
@@ -241,8 +241,8 @@ void ImageRender::Render()
projmat = m_rasterizer->GetOrthoMatrix(
frustrum.x1, frustrum.x2, frustrum.y1, frustrum.y2, frustrum.camnear, frustrum.camfar);
- } else
- {
+ }
+ else {
RAS_FramingManager::ComputeDefaultFrustum(
nearfrust,
farfrust,
@@ -604,13 +604,12 @@ ImageRender::ImageRender (KX_Scene * scene, KX_GameObject * observer, KX_GameObj
mirrorVerts.push_back(v1);
mirrorVerts.push_back(v2);
mirrorVerts.push_back(v3);
- if (polygon->VertexCount() == 4)
- {
+ if (polygon->VertexCount() == 4) {
v4 = polygon->GetVertex(3);
mirrorVerts.push_back(v4);
area = normal_quad_v3(normal,(float*)v1->getXYZ(), (float*)v2->getXYZ(), (float*)v3->getXYZ(), (float*)v4->getXYZ());
- } else
- {
+ }
+ else {
area = normal_tri_v3(normal,(float*)v1->getXYZ(), (float*)v2->getXYZ(), (float*)v3->getXYZ());
}
area = fabs(area);
diff --git a/source/gameengine/VideoTexture/Texture.cpp b/source/gameengine/VideoTexture/Texture.cpp
index f08a5a4a0b3..a21300018eb 100644
--- a/source/gameengine/VideoTexture/Texture.cpp
+++ b/source/gameengine/VideoTexture/Texture.cpp
@@ -130,13 +130,12 @@ short getMaterialID(PyObject * obj, const char *name)
if (mat == NULL)
break;
// name is a material name if it starts with MA and a UV texture name if it starts with IM
- if (name[0] == 'I' && name[1] == 'M')
- {
+ if (name[0] == 'I' && name[1] == 'M') {
// if texture name matches
if (strcmp(mat->GetTextureName().ReadPtr(), name) == 0)
return matID;
- } else
- {
+ }
+ else {
// if material name matches
if (strcmp(mat->GetMaterialName().ReadPtr(), name) == 0)
return matID;