[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15231] trunk/blender/source/gameengine: bugfix, clip alpha wasn't working in the GE, not happy with these functions, they probably need bigger changes not to assume all alpha requires face sorting with a disabled depth buffer ,

[Campbell Barton]

Revision: 15231
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15231
Author:   campbellbarton
Date:     2008-06-15 11:43:24 +0200 (Sun, 15 Jun 2008)

Log Message:
-----------
bugfix, clip alpha wasn't working in the GE, not happy with these functions, 
they probably need bigger changes not to assume all alpha requires face sorting 
with a disabled depth buffer,

Modified Paths:
--------------
    trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    trunk/blender/source/gameengine/Ketsji/KX_BlenderMaterial.cpp

Modified: trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
===================================================================
--- trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp      
2008-06-15 08:56:11 UTC (rev 15230)
+++ trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp      
2008-06-15 09:43:24 UTC (rev 15231)
@@ -542,7 +542,7 @@
                material->amb                   = mat->amb;
 
                // set alpha testing without z-sorting
-               if( ( validface && (!tface->transp)) && mat->mode & MA_ZTRA) {
+               if( ( validface && (!(tface->transp &~ TF_CLIP))) && mat->mode 
& MA_ZTRA) {
                        // sets the RAS_IPolyMaterial::m_flag |RAS_FORCEALPHA
                        // this is so we don't have the overhead of the 
z-sorting code
                        material->ras_mode|=ALPHA_TEST;
@@ -598,7 +598,7 @@
                material->ras_mode |= ( (tface->mode & TF_DYNAMIC)!= 0 
)?COLLIDER:0;
                material->transp = tface->transp;
                
-               if(tface->transp)
+               if(tface->transp&~TF_CLIP)
                        material->ras_mode |= TRANSP;
 
                material->tile  = tface->tile;
@@ -947,7 +947,7 @@
                                                // Use texface colors if 
available
                                                //TF_DYNAMIC means the polygon 
is a collision face
                                                collider = ((tface->mode & 
TF_DYNAMIC) != 0);
-                                               transp = tface->transp;
+                                               transp = tface->transp &~ 
TF_CLIP;
                                                tile = tface->tile;
                                                mode = tface->mode;
                                                

Modified: trunk/blender/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_BlenderMaterial.cpp       
2008-06-15 08:56:11 UTC (rev 15230)
+++ trunk/blender/source/gameengine/Ketsji/KX_BlenderMaterial.cpp       
2008-06-15 09:43:24 UTC (rev 15231)
@@ -493,7 +493,7 @@
                glDisable(GL_BLEND); 
                glEnable ( GL_ALPHA_TEST );
                glAlphaFunc(GL_GREATER, 0.5f);
-               return true;
+               return false;
        }
        return false;
 }


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs