sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

BGE internal cosmetic changes - Replacing hardcoded values with new defines

Browse Source 
---------------------------------------------------------------------------
The Rasterizer code was relying in the values defined on TF_ DNA files. I'm working in the recode of TexFace, bringing the options to the material panel and ran into those cases. They are hard to spot and add a lot of the "magic" effect to the code. Hardcoded values are at least easy to spot. We (still) have a few defines duplicated, relying on each other (a flag previously defined in the code is checked later on but using a different define (although with same value. (e.g. TF_BMFONT and RAS_RENDER_3DPOLYGON_TEXT). It's hell =)
I'm adding some comments to help on that.

Things will be revamped anyways, but it's nice to keep the code a bit more coherent before the real feature commit. That's all, thanks for listening.
This commit is contained in:
Dalai Felinto 2011-03-07 19:14:17 +00:00
parent aa6c975fa8
commit c39a109dae
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/gameengine/Ketsji/KX_PolygonMaterial.cpp
View File

@ -172,7 +172,7 @@ void KX_PolygonMaterial::DefaultActivate(RAS_IRasterizer* rasty, TCachingInfo& c
cachingInfo = GetCachingInfo();
if ((m_drawingmode & 4)&& (rasty->GetDrawingMode() == RAS_IRasterizer::KX_TEXTURED))
if ((m_drawingmode & RAS_IRasterizer::KX_TEX)&& (rasty->GetDrawingMode() == RAS_IRasterizer::KX_TEXTURED))
{
Image *ima = (Image*)m_tface->tpage;
GPU_update_image_time(ima, rasty->GetTime());

2
source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
View File

@ -241,7 +241,7 @@ bool RAS_IPolyMaterial::UsesLighting(RAS_IRasterizer *rasty) const
else if(rasty->GetDrawingMode() < RAS_IRasterizer::KX_SOLID);
else if(rasty->GetDrawingMode() == RAS_IRasterizer::KX_SHADOW);
else
dolights = (m_drawingmode & 16)!=0;
dolights = (m_drawingmode & RAS_IRasterizer::KX_LIGHT)!=0;
return dolights;
}

6
source/gameengine/Rasterizer/RAS_IRasterizer.h
View File

@ -71,7 +71,7 @@ public:
/**
*/
enum {
RAS_RENDER_3DPOLYGON_TEXT = 16384
RAS_RENDER_3DPOLYGON_TEXT = 16384 /* TF_BMFONT */
};
/**
* Drawing types
@ -106,7 +106,9 @@ public:
/**
*/
enum {
KX_TWOSIDE = 512,
KX_TEX = 4, /* TF_TEX */
KX_LIGHT = 16, /* TF_LIGHT */
KX_TWOSIDE = 512, /* TF_TWOSIDE */
KX_LINES = 32768
};