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-09-16 08:58:18 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-09-16 08:58:18 +0400
commit2fb82920059257fd7ac8e33bfe53de13e7ed53bd (patch)
treecb8de3a839cb9878d0869d4e436a235346109c16 /source/gameengine/Rasterizer
parentc2a1dcf6218cbd56126a5deb1aeaf212d67e54cb (diff)
style cleanup
Diffstat (limited to 'source/gameengine/Rasterizer')
-rw-r--r--source/gameengine/Rasterizer/RAS_2DFilterManager.cpp4
-rw-r--r--source/gameengine/Rasterizer/RAS_BucketManager.cpp4
-rw-r--r--source/gameengine/Rasterizer/RAS_Deformer.h2
-rw-r--r--source/gameengine/Rasterizer/RAS_FramingManager.cpp14
-rw-r--r--source/gameengine/Rasterizer/RAS_FramingManager.h8
-rw-r--r--source/gameengine/Rasterizer/RAS_IRasterizer.h2
-rw-r--r--source/gameengine/Rasterizer/RAS_IRenderTools.h30
-rw-r--r--source/gameengine/Rasterizer/RAS_MaterialBucket.cpp8
-rw-r--r--source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp4
-rw-r--r--source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h2
10 files changed, 39 insertions, 39 deletions
diff --git a/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp b/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
index 06251cd2282..7312b521788 100644
--- a/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
+++ b/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
@@ -110,7 +110,7 @@ void RAS_2DFilterManager::PrintShaderErrors(unsigned int shader, const char *tas
unsigned int RAS_2DFilterManager::CreateShaderProgram(const char* shadersource)
{
- GLuint program = 0;
+ GLuint program = 0;
GLuint fShader = glCreateShaderObjectARB(GL_FRAGMENT_SHADER);
GLint success;
@@ -469,7 +469,7 @@ void RAS_2DFilterManager::RenderFilters(RAS_ICanvas* canvas)
glEnable(GL_DEPTH_TEST);
glViewport(viewport[0],viewport[1],viewport[2],viewport[3]);
- EndShaderProgram();
+ EndShaderProgram();
glPopMatrix();
glMatrixMode(GL_MODELVIEW);
glPopMatrix();
diff --git a/source/gameengine/Rasterizer/RAS_BucketManager.cpp b/source/gameengine/Rasterizer/RAS_BucketManager.cpp
index 90587bb9739..457fd0ad90c 100644
--- a/source/gameengine/Rasterizer/RAS_BucketManager.cpp
+++ b/source/gameengine/Rasterizer/RAS_BucketManager.cpp
@@ -232,8 +232,8 @@ void RAS_BucketManager::Renderbuckets(
/* beginning each frame, clear (texture/material) caching information */
rasty->ClearCachingInfo();
- RenderSolidBuckets(cameratrans, rasty, rendertools);
- RenderAlphaBuckets(cameratrans, rasty, rendertools);
+ RenderSolidBuckets(cameratrans, rasty, rendertools);
+ RenderAlphaBuckets(cameratrans, rasty, rendertools);
rendertools->SetClientObject(rasty, NULL);
}
diff --git a/source/gameengine/Rasterizer/RAS_Deformer.h b/source/gameengine/Rasterizer/RAS_Deformer.h
index 51c4da3c49d..d70e56dc285 100644
--- a/source/gameengine/Rasterizer/RAS_Deformer.h
+++ b/source/gameengine/Rasterizer/RAS_Deformer.h
@@ -91,7 +91,7 @@ public:
protected:
class RAS_MeshObject *m_pMesh;
- bool m_bDynamic;
+ bool m_bDynamic;
#ifdef WITH_CXX_GUARDEDALLOC
diff --git a/source/gameengine/Rasterizer/RAS_FramingManager.cpp b/source/gameengine/Rasterizer/RAS_FramingManager.cpp
index 1cd110f8cc6..53d9b64ab0e 100644
--- a/source/gameengine/Rasterizer/RAS_FramingManager.cpp
+++ b/source/gameengine/Rasterizer/RAS_FramingManager.cpp
@@ -43,7 +43,7 @@ ComputeDefaultFrustum(
const short sensor_fit,
const float design_aspect_ratio,
RAS_FrameFrustum & frustum
-) {
+) {
float halfSize;
float sizeX;
float sizeY;
@@ -202,7 +202,7 @@ ComputeViewport(
{
ComputeBestFitViewRect(
availableViewport,
- design_aspect_ratio,
+ design_aspect_ratio,
viewport
);
@@ -260,7 +260,7 @@ ComputeFrustum(
RAS_Rect vt;
ComputeBestFitViewRect(
availableViewport,
- design_aspect_ratio,
+ design_aspect_ratio,
vt
);
@@ -277,13 +277,13 @@ ComputeFrustum(
frustum.y2 *= y_scale;
break;
- }
+ }
case RAS_FrameSettings::e_frame_scale :
case RAS_FrameSettings::e_frame_bars:
default :
break;
}
-}
+}
void
RAS_FramingManager::
@@ -330,7 +330,7 @@ RAS_FramingManager::
RAS_Rect vt;
ComputeBestFitViewRect(
availableViewport,
- design_aspect_ratio,
+ design_aspect_ratio,
vt
);
@@ -347,7 +347,7 @@ RAS_FramingManager::
frustum.y2 *= y_scale;
break;
- }
+ }
case RAS_FrameSettings::e_frame_scale :
case RAS_FrameSettings::e_frame_bars:
default :
diff --git a/source/gameengine/Rasterizer/RAS_FramingManager.h b/source/gameengine/Rasterizer/RAS_FramingManager.h
index dd640bc6839..122f0ca46ec 100644
--- a/source/gameengine/Rasterizer/RAS_FramingManager.h
+++ b/source/gameengine/Rasterizer/RAS_FramingManager.h
@@ -109,7 +109,7 @@ public :
*/
const
- RAS_FrameType &
+ RAS_FrameType &
FrameType(
) const {
return m_frame_type;
@@ -143,13 +143,13 @@ public :
unsigned int
DesignAspectWidth(
) const {
- return m_design_aspect_width;
+ return m_design_aspect_width;
};
unsigned int
DesignAspectHeight(
) const {
- return m_design_aspect_height;
+ return m_design_aspect_height;
};
private :
@@ -262,7 +262,7 @@ public :
const short sensor_fit,
const float design_aspect_ratio,
RAS_FrameFrustum & frustum
- );
+ );
static
void
diff --git a/source/gameengine/Rasterizer/RAS_IRasterizer.h b/source/gameengine/Rasterizer/RAS_IRasterizer.h
index 7749c4af9d6..8efc10f2118 100644
--- a/source/gameengine/Rasterizer/RAS_IRasterizer.h
+++ b/source/gameengine/Rasterizer/RAS_IRasterizer.h
@@ -301,7 +301,7 @@ public:
virtual int GetDrawingMode()=0;
/**
* Sets face culling
- */
+ */
virtual void SetCullFace(bool enable)=0;
/**
* Sets wireframe mode.
diff --git a/source/gameengine/Rasterizer/RAS_IRenderTools.h b/source/gameengine/Rasterizer/RAS_IRenderTools.h
index c02bc5e7a44..ca6f20b71ad 100644
--- a/source/gameengine/Rasterizer/RAS_IRenderTools.h
+++ b/source/gameengine/Rasterizer/RAS_IRenderTools.h
@@ -72,18 +72,18 @@ public:
{
};
- virtual
+ virtual
~RAS_IRenderTools(
) {};
virtual
- void
+ void
BeginFrame(
RAS_IRasterizer* rasty
)=0;
virtual
- void
+ void
EndFrame(
RAS_IRasterizer* rasty
)=0;
@@ -94,7 +94,7 @@ public:
// so must be renamed to 'applyTransform' or something
virtual
- void
+ void
applyTransform(
class RAS_IRasterizer* rasty,
double* oglmatrix,
@@ -112,7 +112,7 @@ public:
* \param aspect A scaling factor to compensate for the size.
*/
virtual
- void
+ void
RenderText3D(int fontid,
const char* text,
int size,
@@ -133,7 +133,7 @@ public:
* \param height Height of the canvas to draw to.
*/
virtual
- void
+ void
RenderText2D(
RAS_TEXT_RENDER_MODE mode,
const char* text,
@@ -145,7 +145,7 @@ public:
// 3d text, mapped on polygon
virtual
- void
+ void
RenderText(
int mode,
RAS_IPolyMaterial* polymat,
@@ -156,8 +156,8 @@ public:
int glattrib
)=0;
- virtual
- void
+ virtual
+ void
ProcessLighting(
RAS_IRasterizer *rasty,
bool uselights,
@@ -165,35 +165,35 @@ public:
)=0;
virtual
- void
+ void
SetClientObject(
RAS_IRasterizer* rasty,
void* obj
);
- void
+ void
SetAuxilaryClientInfo(
void* inf
);
virtual
- void
+ void
PushMatrix(
)=0;
virtual
- void
+ void
PopMatrix(
)=0;
virtual
- void
+ void
AddLight(
struct RAS_LightObject* lightobject
);
virtual
- void
+ void
RemoveLight(
struct RAS_LightObject* lightobject
);
diff --git a/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp b/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
index a18adfd8986..183da9d252e 100644
--- a/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
+++ b/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
@@ -489,7 +489,7 @@ bool RAS_MeshSlot::Split(bool force)
}
-#ifdef USE_SPLIT
+#ifdef USE_SPLIT
bool RAS_MeshSlot::IsCulled()
{
if (m_joinSlot)
@@ -502,7 +502,7 @@ bool RAS_MeshSlot::IsCulled()
return false;
return true;
}
-#endif
+#endif
/* material bucket sorting */
@@ -531,12 +531,12 @@ RAS_IPolyMaterial* RAS_MaterialBucket::GetPolyMaterial() const
}
bool RAS_MaterialBucket::IsAlpha() const
-{
+{
return (m_material->IsAlpha());
}
bool RAS_MaterialBucket::IsZSort() const
-{
+{
return (m_material->IsZSort());
}
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
index b769fc4b703..67423123a7a 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
@@ -438,7 +438,7 @@ void RAS_OpenGLRasterizer::EndFrame()
glDisable(GL_MULTISAMPLE_ARB);
m_2DCanvas->EndFrame();
-}
+}
void RAS_OpenGLRasterizer::SetRenderArea()
{
@@ -975,7 +975,7 @@ void RAS_OpenGLRasterizer::SetProjectionMatrix(const MT_Matrix4x4 & mat)
/* Get into argument. Looks a bit dodgy, but it's ok. */
mat.getValue(matrix);
/* Internally, MT_Matrix4x4 uses doubles (MT_Scalar). */
- glLoadMatrixd(matrix);
+ glLoadMatrixd(matrix);
m_camortho= (mat[3][3] != 0.0);
}
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
index e5eba249175..8b54f507ee0 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
@@ -278,7 +278,7 @@ public:
line.m_type = OglDebugShape::CIRCLE;
line.m_pos= center;
line.m_param = normal;
- line.m_color = color;
+ line.m_color = color;
line.m_param2.x() = radius;
line.m_param2.y() = (float) nsector;
m_debugShapes.push_back(line);