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

fix draw_Sphere

Browse Source
This commit is contained in:
georges 2001-02-18 04:15:36 +00:00
parent 8d4e5940d5
commit a6f1886078
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2632,7 +2632,7 @@ GenerateSphere(void *pVertexSpace,DWORD dwVertSpaceByteSize,
dwNumTriangles = (wNumRings-1) * wNumSections * 2; dwNumTriangles = (wNumRings-1) * wNumSections * 2;
} else { } else {
dwNumVertices = *pNumVertices = wNumRings * wNumSections + 2; dwNumVertices = *pNumVertices = wNumRings * wNumSections + 2;
dwNumTriangles = (wNumRings+1) * wNumSections * 2; dwNumTriangles = wNumRings*wNumSections*2;
} }
dwNumIndices = *pNumIndices = dwNumTriangles*3; dwNumIndices = *pNumIndices = dwNumTriangles*3;
@ -2660,9 +2660,16 @@ GenerateSphere(void *pVertexSpace,DWORD dwVertSpaceByteSize,
if(fvfFlags & D3DFVF_TEXCOUNT_MASK) \ if(fvfFlags & D3DFVF_TEXCOUNT_MASK) \
add_to_FVFBuf((void *)texCoords, sizeof(TexCoordf)); add_to_FVFBuf((void *)texCoords, sizeof(TexCoordf));
#ifdef DBG_GENSPHERE
int nvs_written=0;
memset(pVertexSpace,0xFF,dwNumVertices*dwVertSize);
#endif
if(! DOTEXTURING) { if(! DOTEXTURING) {
ADD_GENSPHERE_VERTEX_TO_BUFFER(vTopPoint); ADD_GENSPHERE_VERTEX_TO_BUFFER(vTopPoint);
#ifdef DBG_GENSPHERE
nvs_written++;
#endif
} }
// Generate vertex points for rings // Generate vertex points for rings
@ -2682,11 +2689,6 @@ GenerateSphere(void *pVertexSpace,DWORD dwVertSpaceByteSize,
} }
float phi,dphi = (float)(2*M_PI / (wNumSections-1)); //Angle between each section float phi,dphi = (float)(2*M_PI / (wNumSections-1)); //Angle between each section
#ifdef DBG_GENSPHERE
int nvs_written=0;
memset(pVertexSpace,0xFF,dwNumVertices*dwVertSize);
#endif
for(i = 0; i < wNumRings; i++ ) { for(i = 0; i < wNumRings; i++ ) {
float costheta,sintheta,cosphi,sinphi; float costheta,sintheta,cosphi,sinphi;
phi = 0.0; phi = 0.0;
@ -2732,16 +2734,20 @@ GenerateSphere(void *pVertexSpace,DWORD dwVertSpaceByteSize,
theta += dtheta; theta += dtheta;
} }
#ifdef DBG_GENSPHERE
assert(nvs_written == dwNumVertices);
#endif
if(! DOTEXTURING) { if(! DOTEXTURING) {
// Generate bottom vertex // Generate bottom vertex
vNormal = D3DVECTOR( 0.0f, -1.0f, 0.0f ); vNormal = D3DVECTOR( 0.0f, -1.0f, 0.0f );
ADD_GENSPHERE_VERTEX_TO_BUFFER(vBotPoint); ADD_GENSPHERE_VERTEX_TO_BUFFER(vBotPoint);
#ifdef DBG_GENSPHERE
nvs_written++;
#endif
} }
#ifdef DBG_GENSPHERE
assert(nvs_written == dwNumVertices);
#endif
#ifdef DBG_GENSPHERE #ifdef DBG_GENSPHERE
memset(pwIndices,0xFF,dwNumIndices*sizeof(WORD)); memset(pwIndices,0xFF,dwNumIndices*sizeof(WORD));
#endif #endif
@ -2814,8 +2820,14 @@ GenerateSphere(void *pVertexSpace,DWORD dwVertSpaceByteSize,
} }
#ifdef DBG_GENSPHERE #ifdef DBG_GENSPHERE
if(DOTEXTURING) {
assert(CurFinalTriIndex == dwNumTriangles); assert(CurFinalTriIndex == dwNumTriangles);
assert(base_index == dwNumIndices); assert(base_index == dwNumIndices);
} else {
assert(CurFinalTriIndex == dwNumTriangles-wNumSections);
assert(base_index == dwNumIndices-wNumSections*3);
}
for(i = 0; i < dwNumIndices; i++ ) for(i = 0; i < dwNumIndices; i++ )
assert(pwIndices[i] <dwNumVertices); assert(pwIndices[i] <dwNumVertices);
#endif #endif