[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45967] branches/soc-2011-cucumber/source/ gameengine: Some style clean up on if and for statements to match trunk.
Daniel Stokes
kupomail at gmail.com
Thu Apr 26 04:32:04 CEST 2012
Revision: 45967
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45967
Author: kupoman
Date: 2012-04-26 02:32:00 +0000 (Thu, 26 Apr 2012)
Log Message:
-----------
Some style clean up on if and for statements to match trunk.
Modified Paths:
--------------
branches/soc-2011-cucumber/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/soc-2011-cucumber/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/soc-2011-cucumber/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/soc-2011-cucumber/source/gameengine/Ketsji/BL_BlenderShader.cpp
branches/soc-2011-cucumber/source/gameengine/Ketsji/BL_Material.cpp
branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_Light.cpp
branches/soc-2011-cucumber/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageIM.cpp
branches/soc-2011-cucumber/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVA.cpp
branches/soc-2011-cucumber/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVBO.cpp
branches/soc-2011-cucumber/source/gameengine/Rasterizer/RAS_TexVert.cpp
Modified: branches/soc-2011-cucumber/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
===================================================================
--- branches/soc-2011-cucumber/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp 2012-04-26 02:24:55 UTC (rev 45966)
+++ branches/soc-2011-cucumber/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp 2012-04-26 02:32:00 UTC (rev 45967)
@@ -206,7 +206,7 @@
//Don't use displaylists with VBOs
//If auto starts using VBOs, make sure to check for that here
- if(displaylists && startscene->gm.raster_storage != RAS_STORE_VBO)
+ if (displaylists && startscene->gm.raster_storage != RAS_STORE_VBO)
rasterizer = new RAS_ListRasterizer(canvas, true, startscene->gm.raster_storage);
else
rasterizer = new RAS_OpenGLRasterizer(canvas, startscene->gm.raster_storage);
Modified: branches/soc-2011-cucumber/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
===================================================================
--- branches/soc-2011-cucumber/source/gameengine/Converter/KX_BlenderSceneConverter.cpp 2012-04-26 02:24:55 UTC (rev 45966)
+++ branches/soc-2011-cucumber/source/gameengine/Converter/KX_BlenderSceneConverter.cpp 2012-04-26 02:32:00 UTC (rev 45967)
@@ -348,7 +348,7 @@
}
// Lights added to the scene during the light pool initialization are now skipped when converting objects
- if(blenderscene && m_useglslmat)
+ if (blenderscene && m_useglslmat)
KX_LightObject::InitBlenderLightPool(blenderscene,
blenderscene->gm.dynpoints,
blenderscene->gm.dynspots,
Modified: branches/soc-2011-cucumber/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
===================================================================
--- branches/soc-2011-cucumber/source/gameengine/GamePlayer/ghost/GPG_Application.cpp 2012-04-26 02:24:55 UTC (rev 45966)
+++ branches/soc-2011-cucumber/source/gameengine/GamePlayer/ghost/GPG_Application.cpp 2012-04-26 02:32:00 UTC (rev 45967)
@@ -580,7 +580,7 @@
//Don't use displaylists with VBOs
//If auto starts using VBOs, make sure to check for that here
- if(useLists && gm->raster_storage != RAS_STORE_VBO)
+ if (useLists && gm->raster_storage != RAS_STORE_VBO)
m_rasterizer = new RAS_ListRasterizer(m_canvas, false, gm->raster_storage);
else
m_rasterizer = new RAS_OpenGLRasterizer(m_canvas, gm->raster_storage);
Modified: branches/soc-2011-cucumber/source/gameengine/Ketsji/BL_BlenderShader.cpp
===================================================================
--- branches/soc-2011-cucumber/source/gameengine/Ketsji/BL_BlenderShader.cpp 2012-04-26 02:24:55 UTC (rev 45966)
+++ branches/soc-2011-cucumber/source/gameengine/Ketsji/BL_BlenderShader.cpp 2012-04-26 02:32:00 UTC (rev 45967)
@@ -93,14 +93,14 @@
ras->SetTexCoordNum(0);
ras->SetAttribNum(attrib_num);
- for (i=0; i<attrib_num; i++)
+ for (i = 0; i < attrib_num; i++)
ras->SetAttrib(RAS_IRasterizer::RAS_TEXCO_DISABLE, i);
for (i = 0; i < attribs.totlayer; i++) {
if (attribs.layer[i].glindex > attrib_num)
continue;
- if(attribs.layer[i].type == CD_MTFACE)
+ if (attribs.layer[i].type == CD_MTFACE)
ras->SetAttrib(RAS_IRasterizer::RAS_TEXCO_UV, attribs.layer[i].glindex);
else if (attribs.layer[i].type == CD_TANGENT)
ras->SetAttrib(RAS_IRasterizer::RAS_TEXTANGENT, attribs.layer[i].glindex);
Modified: branches/soc-2011-cucumber/source/gameengine/Ketsji/BL_Material.cpp
===================================================================
--- branches/soc-2011-cucumber/source/gameengine/Ketsji/BL_Material.cpp 2012-04-26 02:24:55 UTC (rev 45966)
+++ branches/soc-2011-cucumber/source/gameengine/Ketsji/BL_Material.cpp 2012-04-26 02:32:00 UTC (rev 45967)
@@ -66,13 +66,13 @@
share = false;
int i,j;
- for (i=0; i<4; i++)
+ for (i = 0; i < 4; i++)
{
- for(j=0; j<MAXTEX; j++)
+ for (j = 0; j < MAXTEX; j++)
uvs[i][j] = MT_Point2(0.0,0.0);
}
- for (i=0; i<MAXTEX; i++) // :(
+ for (i = 0; i < MAXTEX; i++) // :(
{
mapping[i].mapping = 0;
mapping[i].offsets[0] = 0.f;
@@ -116,18 +116,20 @@
void BL_Material::SetConversionUV(const MT_Point2 nuv[4][MAXTEX])
{
- for(int i=0; i<4; ++i)
+ int i, j;
+ for (i = 0; i < 4; ++i)
{
- for (int j=0; j<MAXTEX; ++j)
+ for (j = 0; j < MAXTEX; ++j)
uvs[i][j] = nuv[i][j];
}
}
void BL_Material::GetConversionUV(MT_Point2 nuv[4][8])
{
- for(int i=0; i<4; ++i)
+ int i, j;
+ for (i = 0; i < 4; ++i)
{
- for (int j=0; j<MAXTEX; ++j)
+ for (j = 0; j < MAXTEX; ++j)
nuv[i][j] = this->uvs[i][j];
}
}
Modified: branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_Light.cpp
===================================================================
--- branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_Light.cpp 2012-04-26 02:24:55 UTC (rev 45966)
+++ branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_Light.cpp 2012-04-26 02:32:00 UTC (rev 45967)
@@ -451,7 +451,7 @@
BLI_remlink(&m_blenderlight_scene->base, base);
GPU_lamp_free(base->object);
free_libblock_us(&G.main->object, base->object);
- if(m_blenderlight_scene->basact==base) m_blenderlight_scene->basact=NULL;
+ if (m_blenderlight_scene->basact == base) m_blenderlight_scene->basact = NULL;
MEM_freeN(base);
subpool->pop_back();
}
Modified: branches/soc-2011-cucumber/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageIM.cpp
===================================================================
--- branches/soc-2011-cucumber/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageIM.cpp 2012-04-26 02:24:55 UTC (rev 45966)
+++ branches/soc-2011-cucumber/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageIM.cpp 2012-04-26 02:32:00 UTC (rev 45967)
@@ -69,50 +69,50 @@
{
int unit;
- if(GLEW_ARB_multitexture) {
- for(unit=0; unit<*m_texco_num; unit++) {
+ if (GLEW_ARB_multitexture) {
+ for (unit = 0; unit < *m_texco_num; unit++) {
switch(m_texco[unit]) {
- case RAS_IRasterizer::RAS_TEXCO_ORCO:
- case RAS_IRasterizer::RAS_TEXCO_GLOB:
- glMultiTexCoord3fvARB(GL_TEXTURE0_ARB+unit, tv.getXYZ());
- break;
- case RAS_IRasterizer::RAS_TEXCO_UV:
- glMultiTexCoord2fvARB(GL_TEXTURE0_ARB+unit, tv.getUV(unit));
- break;
- case RAS_IRasterizer::RAS_TEXCO_NORM:
- glMultiTexCoord3fvARB(GL_TEXTURE0_ARB+unit, tv.getNormal());
- break;
- case RAS_IRasterizer::RAS_TEXTANGENT:
- glMultiTexCoord4fvARB(GL_TEXTURE0_ARB+unit, tv.getTangent());
- break;
- default:
- break;
+ case RAS_IRasterizer::RAS_TEXCO_ORCO:
+ case RAS_IRasterizer::RAS_TEXCO_GLOB:
+ glMultiTexCoord3fvARB(GL_TEXTURE0_ARB + unit, tv.getXYZ());
+ break;
+ case RAS_IRasterizer::RAS_TEXCO_UV:
+ glMultiTexCoord2fvARB(GL_TEXTURE0_ARB + unit, tv.getUV(unit));
+ break;
+ case RAS_IRasterizer::RAS_TEXCO_NORM:
+ glMultiTexCoord3fvARB(GL_TEXTURE0_ARB + unit, tv.getNormal());
+ break;
+ case RAS_IRasterizer::RAS_TEXTANGENT:
+ glMultiTexCoord4fvARB(GL_TEXTURE0_ARB + unit, tv.getTangent());
+ break;
+ default:
+ break;
}
}
}
- if(GLEW_ARB_vertex_program) {
+ if (GLEW_ARB_vertex_program) {
int uv = 0;
- for(unit=0; unit<*m_attrib_num; unit++) {
+ for (unit = 0; unit < *m_attrib_num; unit++) {
switch(m_attrib[unit]) {
- case RAS_IRasterizer::RAS_TEXCO_ORCO:
- case RAS_IRasterizer::RAS_TEXCO_GLOB:
- glVertexAttrib3fvARB(unit, tv.getXYZ());
- break;
- case RAS_IRasterizer::RAS_TEXCO_UV:
- glVertexAttrib2fvARB(unit, tv.getUV(uv++));
- break;
- case RAS_IRasterizer::RAS_TEXCO_NORM:
- glVertexAttrib3fvARB(unit, tv.getNormal());
- break;
- case RAS_IRasterizer::RAS_TEXTANGENT:
- glVertexAttrib4fvARB(unit, tv.getTangent());
- break;
- case RAS_IRasterizer::RAS_TEXCO_VCOL:
- glVertexAttrib4ubvARB(unit, tv.getRGBA());
- break;
- default:
- break;
+ case RAS_IRasterizer::RAS_TEXCO_ORCO:
+ case RAS_IRasterizer::RAS_TEXCO_GLOB:
+ glVertexAttrib3fvARB(unit, tv.getXYZ());
+ break;
+ case RAS_IRasterizer::RAS_TEXCO_UV:
+ glVertexAttrib2fvARB(unit, tv.getUV(uv++));
+ break;
+ case RAS_IRasterizer::RAS_TEXCO_NORM:
+ glVertexAttrib3fvARB(unit, tv.getNormal());
+ break;
+ case RAS_IRasterizer::RAS_TEXTANGENT:
+ glVertexAttrib4fvARB(unit, tv.getTangent());
+ break;
+ case RAS_IRasterizer::RAS_TEXCO_VCOL:
+ glVertexAttrib4ubvARB(unit, tv.getRGBA());
+ break;
+ default:
+ break;
}
}
}
@@ -249,17 +249,17 @@
return;
}
// iterate over display arrays, each containing an index + vertex array
- for(ms.begin(it); !ms.end(it); ms.next(it)) {
+ for (ms.begin(it); !ms.end(it); ms.next(it)) {
RAS_TexVert *vertex;
size_t i, j, numvert;
numvert = it.array->m_type;
- if(it.array->m_type == RAS_DisplayArray::LINE) {
+ if (it.array->m_type == RAS_DisplayArray::LINE) {
// line drawing
glBegin(GL_LINES);
- for(i=0; i<it.totindex; i+=2)
+ for (i = 0; i < it.totindex; i += 2)
{
vertex = &it.vertex[it.index[i]];
glVertex3fv(vertex->getXYZ());
@@ -272,26 +272,26 @@
}
else {
// triangle and quad drawing
- if(it.array->m_type == RAS_DisplayArray::TRIANGLE)
+ if (it.array->m_type == RAS_DisplayArray::TRIANGLE)
glBegin(GL_TRIANGLES);
else
glBegin(GL_QUADS);
- for(i=0; i<it.totindex; i+=numvert)
+ for (i = 0; i < it.totindex; i += numvert)
{
- if(obcolor)
+ if (obcolor)
glColor4d(rgba[0], rgba[1], rgba[2], rgba[3]);
- for(j=0; j<numvert; j++) {
+ for (j = 0; j < numvert; j++) {
vertex = &it.vertex[it.index[i+j]];
- if(!wireframe) {
- if(!obcolor)
+ if (!wireframe) {
+ if (!obcolor)
glColor4ubv((const GLubyte *)(vertex->getRGBA()));
glNormal3fv(vertex->getNormal());
- if(multi)
+ if (multi)
TexCoord(*vertex);
else
glTexCoord2fv(vertex->getUV(0));
Modified: branches/soc-2011-cucumber/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVA.cpp
===================================================================
--- branches/soc-2011-cucumber/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVA.cpp 2012-04-26 02:24:55 UTC (rev 45966)
+++ branches/soc-2011-cucumber/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVA.cpp 2012-04-26 02:32:00 UTC (rev 45967)
@@ -70,18 +70,18 @@
RAS_MeshSlot::iterator it;
GLenum drawmode;
- if(!wireframe)
+ if (!wireframe)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list