TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 01:44:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix small thing

Browse Source
This commit is contained in:
cxgeorge 2002-03-15 03:30:18 +00:00
parent 56327230c4
commit 1e7fac0531
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
panda/src/dxgsg/dxGraphicsStateGuardian.cxx
View File

@ -437,6 +437,8 @@ free_dxgsg_objects(void) {
// dont want a full reset of gsg, just a state clear // dont want a full reset of gsg, just a state clear
GraphicsStateGuardian::clear_cached_state(); // want gsg to pass all state settings through GraphicsStateGuardian::clear_cached_state(); // want gsg to pass all state settings through
// we need to reset our internal state guards right here because dx_init() should be called after this,
// which resets all of them to our defaults, and syncs them with the D3DRENDERSTATE
_dx_ready = false; _dx_ready = false;
@ -516,8 +518,8 @@ dx_init( void) {
_CurShadeMode = D3DSHADE_FLAT; _CurShadeMode = D3DSHADE_FLAT;
scrn.pD3DDevice->SetRenderState(D3DRENDERSTATE_SHADEMODE, _CurShadeMode); scrn.pD3DDevice->SetRenderState(D3DRENDERSTATE_SHADEMODE, _CurShadeMode);
_depth_test_enabled = true; _depth_write_enabled = true;
scrn.pD3DDevice->SetRenderState(D3DRENDERSTATE_ZWRITEENABLE, _depth_test_enabled); scrn.pD3DDevice->SetRenderState(D3DRENDERSTATE_ZWRITEENABLE, _depth_write_enabled);
// need to free these properly // need to free these properly
#ifndef USE_TEXFMTVEC #ifndef USE_TEXFMTVEC
@ -5484,10 +5486,10 @@ issue_color_mask(const ColorMaskTransition *attrib) {
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void DXGraphicsStateGuardian:: void DXGraphicsStateGuardian::
issue_depth_test(const DepthTestTransition *attrib) { issue_depth_test(const DepthTestTransition *attrib) {
DepthTestProperty::Mode mode = attrib->get_mode(); DepthTestProperty::Mode mode = attrib->get_mode();
// no cache check since we dont store ZFUNC along w/bool val
if (mode == DepthTestProperty::M_none) { if (mode == DepthTestProperty::M_none) {
_depth_test_enabled = false; _depth_test_enabled = false;
scrn.pD3DDevice->SetRenderState(D3DRENDERSTATE_ZENABLE, D3DZB_FALSE); scrn.pD3DDevice->SetRenderState(D3DRENDERSTATE_ZENABLE, D3DZB_FALSE);
@ -5884,8 +5886,6 @@ end_decal(GeomNode *base_geom) {
scrn.pD3DDevice->SetRenderState(D3DRENDERSTATE_PLANEMASK,0x0); // note PLANEMASK is supposedly obsolete for DX7 scrn.pD3DDevice->SetRenderState(D3DRENDERSTATE_PLANEMASK,0x0); // note PLANEMASK is supposedly obsolete for DX7
} }
#endif #endif
// Note: For DX8, use D3DRS_COLORWRITEENABLE (check D3DPMISCCAPS_COLORWRITEENABLE first)
// No need to have texturing on for this. // No need to have texturing on for this.
enable_texturing(false); enable_texturing(false);