fix decals

panda/src/dxgsg8/config_dxgsg8.cxx

@@ -92,7 +92,7 @@ bool dx_force_anisotropic_filtering = config_dxgsg.GetBool("dx-force-anisotropic
 const bool link_tristrips = config_dxgsg.GetBool("link-tristrips", false);
 
 // note:  offset currently disabled since it wasnt working properly
-DXDecalType dx_decal_type = GDT_offset;
+DXDecalType dx_decal_type = GDT_mask;
 
 static DXDecalType
 parse_decal_type(const string &type) {
@@ -104,7 +104,7 @@ parse_decal_type(const string &type) {
     return GDT_offset;
   }
   dxgsg_cat.error() << "Invalid dx-decal-type: " << type << "\n";
-  return GDT_offset;
+  return GDT_mask;
 }
 
 ConfigureFn(config_dxgsg) {

panda/src/dxgsg8/dxGraphicsStateGuardian8.I

@@ -162,6 +162,19 @@ enable_blend(bool val) {
   }
 }
 
+////////////////////////////////////////////////////////////////////
+//     Function: DXGraphicsStateGuardian::enable_blend
+//       Access:
+//  Description:
+////////////////////////////////////////////////////////////////////
+INLINE void DXGraphicsStateGuardian::
+set_color_writemask(UINT color_writemask) {
+  if (_color_writemask != color_writemask) {
+    _color_writemask = color_writemask;
+    scrn.pD3DDevice->SetRenderState(D3DRS_COLORWRITEENABLE, (DWORD)color_writemask);
+  }
+}
+
 ////////////////////////////////////////////////////////////////////
 //     Function: DXGraphicsStateGuardian::enable_blend
 //       Access:

panda/src/dxgsg8/dxGraphicsStateGuardian8.cxx

@@ -437,6 +437,8 @@ DXGraphicsStateGuardian(GraphicsWindow *win) : GraphicsStateGuardian(win) {
     _CurFVFType = 0x0;
     _max_light_range = __D3DLIGHT_RANGE_MAX;
 
+    _color_writemask = 0xFFFFFFFF;
+
 //    scrn.pD3DDevicesPrimary = scrn.pD3DDevicesZBuf = scrn.pD3DDevicesBack = NULL;
 //    _pDD = NULL;
 //    scrn.pD3DDevice = NULL;
@@ -5250,11 +5252,15 @@ end_decal(GeomNode *base_geom) {
             // Now we need to re-render the base geometry with the depth write
             // on and the color mask off, so we update the depth buffer
             // properly.
-            bool was_textured = _texturing_enabled;
-            bool was_blend = _blend_enabled;
-            D3DBLEND old_blend_source_func = _blend_source_func;
-            D3DBLEND old_blend_dest_func = _blend_dest_func;
 
+            // need to save the state we change on the stack, since we could get called
+            // recursively by the draw() method
+            D3DBLEND saved_blend_source_func = _blend_source_func;
+            D3DBLEND saved_blend_dest_func = _blend_dest_func;
+            UINT saved_colorwritemask = _color_writemask;
+            bool saved_texture_enabled = _texturing_enabled;
+            bool saved_blend_enabled = _blend_enabled;
+    
             // Enable the writing to the depth buffer.
             enable_zwritemask(true);
 
@@ -5264,16 +5270,11 @@ end_decal(GeomNode *base_geom) {
                 // Expensive.
                 enable_blend(true);
                 call_dxBlendFunc(D3DBLEND_ZERO, D3DBLEND_ONE);
+            } else {  
+                // note: not saving current colorwriteenable val, assumes this is always all 1's.  bugbug is this OK?
+                set_color_writemask(0x0);
             }
 
-#if(DIRECT3D_VERSION < 0x700)
-            else {  // dx7 doesn't support planemask rstate
-                // note: not saving current planemask val, assumes this is always all 1's.  should be ok
-                scrn.pD3DDevice->SetRenderState(D3DRS_PLANEMASK,0x0);  // note PLANEMASK is supposedly obsolete for DX7
-            }
-#endif
-            // Note: For DX8, use D3DRS_COLORWRITEENABLE  (check D3DPMISCCAPS_COLORWRITEENABLE first)
-
             // No need to have texturing on for this.
             enable_texturing(false);
 
@@ -5287,21 +5288,19 @@ end_decal(GeomNode *base_geom) {
             // way they're supposed to be.
 
             if (dx_decal_type == GDT_blend) {
-                enable_blend(was_blend);
-                if (was_blend)
-                    call_dxBlendFunc(old_blend_source_func, old_blend_dest_func);
-            }
-#if(DIRECT3D_VERSION < 0x700)
-            else {
-                scrn.pD3DDevice->SetRenderState(D3DRS_PLANEMASK,0xFFFFFFFF);  // this is unlikely to work due to poor driver support
+                enable_blend(saved_blend_enabled);
+                if (saved_blend_enabled)
+                    call_dxBlendFunc(saved_blend_source_func, saved_blend_dest_func);
+            } else {
+                set_color_writemask(saved_colorwritemask);
             }
-#endif
-            enable_texturing(was_textured);
+            enable_texturing(saved_texture_enabled);
 
             // Finally, restore the depth write state to the
             // way they're supposed to be.
 
-            // could we do this faster by saving last issued depth writemask?
+            // needs to match value specified at begin_decal() start, so cant just
+            // save value across this end_decal() call like the other rstates
             DepthWriteTransition *depth_write;
             if (get_attribute_into(depth_write, this)) {
                 issue_depth_write(depth_write);

panda/src/dxgsg8/dxGraphicsStateGuardian8.h

@@ -220,6 +220,7 @@ protected:
   INLINE void enable_clip_plane(int clip_plane_id, bool val);
   INLINE void enable_fog(bool val);
   INLINE void enable_zwritemask(bool val);
+  INLINE void set_color_writemask(UINT color_writemask);
   INLINE void enable_gouraud_shading(bool val);
   INLINE void set_vertex_format(DWORD NewFvfType);
 
@@ -267,7 +268,7 @@ protected:
   D3DCOLOR _d3dcolor_clear_value;
 //  D3DSHADEMODE _CurShadeMode;
   bool _bGouraudShadingOn;
-
+  UINT _color_writemask;
   bool _bDrawPrimDoSetupVertexBuffer;       // if true, draw methods just copy vertex data into pCurrentGeomContext
   DXGeomNodeContext *_pCurrentGeomContext;  // used in vertex buffer setup