TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-05 11:28:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix problems with vertex blending and lighting

Browse Source
This commit is contained in:
David Rose 2005-03-30 04:10:43 +00:00
parent 2ec227a123
commit a8ba02e5b5
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
panda/src/dxgsg8/dxGraphicsStateGuardian8.cxx
View File

@ -197,6 +197,7 @@ DXGraphicsStateGuardian8(const FrameBufferProperties &properties) :
_bDXisReady = false; _bDXisReady = false;
_transform_stale = false; _transform_stale = false;
_vertex_blending_enabled = false;
_overlay_windows_supported = false; _overlay_windows_supported = false;
_pFvfBufBasePtr = NULL; _pFvfBufBasePtr = NULL;
@ -517,21 +518,6 @@ dx_init(void) {
_pD3DDevice->SetRenderState(D3DRS_AMBIENTMATERIALSOURCE, D3DMCS_COLOR1); // Use the diffuse vertex color. _pD3DDevice->SetRenderState(D3DRS_AMBIENTMATERIALSOURCE, D3DMCS_COLOR1); // Use the diffuse vertex color.
/*
Panda no longer requires us to specify the maximum number of
lights up front, but instead we can define slot_new_light() to
decide one-at-a-time whether a particular light fits within our
limit or not. Until we override this function, there is no
limit.
if(_pScrn->d3dcaps.MaxActiveLights==0) {
// 0 indicates no limit on # of lights, but we use DXGSG_MAX_LIGHTS anyway for now
init_lights(DXGSG_MAX_LIGHTS);
} else {
init_lights(min(DXGSG_MAX_LIGHTS,_pScrn->d3dcaps.MaxActiveLights));
}
*/
// must do SetTSS here because redundant states are filtered out by our code based on current values above, so // must do SetTSS here because redundant states are filtered out by our code based on current values above, so
// initial conditions must be correct // initial conditions must be correct
@ -2697,10 +2683,15 @@ begin_draw_primitives(const qpGeom *geom, const qpGeomMunger *munger,
// we have to set a flag to reload the world matrix later. // we have to set a flag to reload the world matrix later.
_transform_stale = true; _transform_stale = true;
} }
_vertex_blending_enabled = true;
} else { } else {
// We're not using vertex blending. // We're not using vertex blending.
if (_vertex_blending_enabled) {
_pD3DDevice->SetRenderState(D3DRS_VERTEXBLEND, D3DVBF_DISABLE); _pD3DDevice->SetRenderState(D3DRS_VERTEXBLEND, D3DVBF_DISABLE);
_pD3DDevice->SetRenderState(D3DRS_INDEXEDVERTEXBLENDENABLE, FALSE);
_vertex_blending_enabled = false;
}
if (_transform_stale) { if (_transform_stale) {
const D3DMATRIX *d3d_mat = (const D3DMATRIX *)_transform->get_mat().get_data(); const D3DMATRIX *d3d_mat = (const D3DMATRIX *)_transform->get_mat().get_data();
@ -2802,6 +2793,14 @@ draw_tristrips(const qpGeomTristrips *primitive) {
void DXGraphicsStateGuardian8:: void DXGraphicsStateGuardian8::
end_draw_primitives() { end_draw_primitives() {
GraphicsStateGuardian::end_draw_primitives(); GraphicsStateGuardian::end_draw_primitives();
// Turn off vertex blending--it seems to cause problems if we leave
// it on.
if (_vertex_blending_enabled) {
_pD3DDevice->SetRenderState(D3DRS_VERTEXBLEND, D3DVBF_DISABLE);
_pD3DDevice->SetRenderState(D3DRS_INDEXEDVERTEXBLENDENABLE, FALSE);
_vertex_blending_enabled = false;
}
} }
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////

1
panda/src/dxgsg8/dxGraphicsStateGuardian8.h
View File

@ -186,6 +186,7 @@ protected:
DXTextureContext8 *_pCurTexContext; DXTextureContext8 *_pCurTexContext;
bool _transform_stale; bool _transform_stale;
bool _vertex_blending_enabled;
RenderBuffer::Type _cur_read_pixel_buffer; // source for copy_pixel_buffer operation RenderBuffer::Type _cur_read_pixel_buffer; // source for copy_pixel_buffer operation
bool _auto_rescale_normal; bool _auto_rescale_normal;