TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 10:22:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix scene_graph_color to work with PER_PRIM geom color

Browse Source
This commit is contained in:
cxgeorge 2002-09-06 01:03:44 +00:00
parent 0cb2b98758
commit bd7f313b91
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2445,6 +2445,19 @@ draw_tri(GeomTri *geom, GeomContext *gc) {
size_t vertex_size = draw_prim_setup(geom); size_t vertex_size = draw_prim_setup(geom);
// Note: draw_prim_setup could unset color flags if global color is set, so must
// recheck this flag here!
bPerPrimColor=(_perPrim & PER_COLOR)!=0x0;
#ifdef _DEBUG
// is it Ok not to recompute bUseTexCoordOnlyLoop even if draw_prim_setup unsets color flags?
// add this check to make sure
bool bNewUseTexCoordOnlyLoop = (((_perVertex & PER_COLOR)==0x0) &&
((_CurFVFType & D3DFVF_NORMAL)==0x0) &&
((_CurFVFType & D3DFVF_TEX1)!=0x0));
assert(bNewUseTexCoordOnlyLoop == bUseTexCoordOnlyLoop);
#endif
nassertv(_pCurFvfBufPtr == NULL); // make sure the storage pointer is clean. nassertv(_pCurFvfBufPtr == NULL); // make sure the storage pointer is clean.
nassertv(nPrims * 3 * vertex_size < VERT_BUFFER_SIZE); nassertv(nPrims * 3 * vertex_size < VERT_BUFFER_SIZE);
_pCurFvfBufPtr = _pFvfBufBasePtr; // _pCurFvfBufPtr changes, _pFvfBufBasePtr doesn't _pCurFvfBufPtr = _pFvfBufBasePtr; // _pCurFvfBufPtr changes, _pFvfBufBasePtr doesn't
@ -2619,6 +2632,19 @@ draw_multitri(Geom *geom, D3DPRIMITIVETYPE trilisttype) {
size_t vertex_size = draw_prim_setup(geom); size_t vertex_size = draw_prim_setup(geom);
// Note: draw_prim_setup could unset color flags if global color is set, so must
// recheck this flag here!
bPerPrimColor=(_perPrim & PER_COLOR)!=0;
#ifdef _DEBUG
// is it Ok not to recompute bUseTexCoordOnlyLoop even if draw_prim_setup unsets color flags?
// add this check to make sure. texcoordonly needs input that with unchanging color, except per-prim
bool bNewUseTexCoordOnlyLoop = ((((_perComp|_perVertex) & PER_COLOR)==0x0) &&
((_CurFVFType & D3DFVF_NORMAL)==0x0) &&
((_CurFVFType & D3DFVF_TEX1)!=0x0));
assert(bNewUseTexCoordOnlyLoop == bUseTexCoordOnlyLoop);
#endif
// iterate through the triangle primitives // iterate through the triangle primitives
int nVerts; int nVerts;