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

fix compiler warnings

Browse Source
This commit is contained in:
cxgeorge 2001-10-29 23:20:01 +00:00
parent 05f1a94e4a
commit b5a1a899ac
2 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2759,7 +2759,7 @@ draw_tri(GeomTri *geom, GeomContext *gc) {
cGeomcount++; cGeomcount++;
#endif #endif
int nPrims = geom->get_num_prims(); DWORD nPrims = geom->get_num_prims();
HRESULT hr; HRESULT hr;
PTA_Vertexf coords; PTA_Vertexf coords;
@ -2819,7 +2819,7 @@ draw_tri(GeomTri *geom, GeomContext *gc) {
// iterate through the triangle primitive // iterate through the triangle primitive
for (int i = 0; i < nPrims; i++) { for (uint i = 0; i < nPrims; i++) {
if (_perPrim & PER_COLOR) { if (_perPrim & PER_COLOR) {
GET_NEXT_COLOR(); GET_NEXT_COLOR();
} }
@ -2886,7 +2886,7 @@ draw_tri(GeomTri *geom, GeomContext *gc) {
nassertv(norms.size()>=nPrims); nassertv(norms.size()>=nPrims);
for (int i=0;i<nPrims;i++,pInVec++,pOutVec+=dwVertsperPrim) { for (uint i=0;i<nPrims;i++,pInVec++,pOutVec+=dwVertsperPrim) {
*pOutVec = *pInVec; *pOutVec = *pInVec;
*(pOutVec+1) = *pInVec; *(pOutVec+1) = *pInVec;
*(pOutVec+2) = *pInVec; *(pOutVec+2) = *pInVec;
@ -2940,14 +2940,14 @@ draw_tri(GeomTri *geom, GeomContext *gc) {
// but if lighting enabled, we need to color every vert since shading will be GOURAUD // but if lighting enabled, we need to color every vert since shading will be GOURAUD
if(!(_color_transform_enabled || _alpha_transform_enabled)) { if(!(_color_transform_enabled || _alpha_transform_enabled)) {
for (int i=0;i<nPrims;i++,pInColor++,pOutColor+=dwVertsperPrim) { for (uint i=0;i<nPrims;i++,pInColor++,pOutColor+=dwVertsperPrim) {
D3DCOLOR newcolr = Colorf_to_D3DCOLOR(*pInColor); D3DCOLOR newcolr = Colorf_to_D3DCOLOR(*pInColor);
*pOutColor = newcolr; *pOutColor = newcolr;
*(pOutColor+1) = newcolr; *(pOutColor+1) = newcolr;
*(pOutColor+2) = newcolr; *(pOutColor+2) = newcolr;
} }
} else { } else {
for (int i=0;i<nPrims;i++,pInColor++,pOutColor+=dwVertsperPrim) { for (uint i=0;i<nPrims;i++,pInColor++,pOutColor+=dwVertsperPrim) {
D3DCOLOR newcolr; D3DCOLOR newcolr;
transform_color(*pInColor,newcolr); transform_color(*pInColor,newcolr);
@ -2961,11 +2961,11 @@ draw_tri(GeomTri *geom, GeomContext *gc) {
// MAKE SURE ShadeMode never set to GOURAUD after this! // MAKE SURE ShadeMode never set to GOURAUD after this!
if(!(_color_transform_enabled || _alpha_transform_enabled)) { if(!(_color_transform_enabled || _alpha_transform_enabled)) {
for (int i=0;i<nPrims;i++,pInColor++,pOutColor+=dwVertsperPrim) { for (uint i=0;i<nPrims;i++,pInColor++,pOutColor+=dwVertsperPrim) {
*pOutColor = Colorf_to_D3DCOLOR(*pInColor); *pOutColor = Colorf_to_D3DCOLOR(*pInColor);
} }
} else { } else {
for (int i=0;i<nPrims;i++,pInColor++,pOutColor+=dwVertsperPrim) { for (uint i=0;i<nPrims;i++,pInColor++,pOutColor+=dwVertsperPrim) {
transform_color(*pInColor,*pOutColor); transform_color(*pInColor,*pOutColor);
} }
} }
@ -2977,11 +2977,11 @@ draw_tri(GeomTri *geom, GeomContext *gc) {
DWORD cNumColors=nPrims*dwVertsperPrim; DWORD cNumColors=nPrims*dwVertsperPrim;
if(!(_color_transform_enabled || _alpha_transform_enabled)) { if(!(_color_transform_enabled || _alpha_transform_enabled)) {
for (int i=0;i<cNumColors;i++,pInColor++,pOutColor++) { for (uint i=0;i<cNumColors;i++,pInColor++,pOutColor++) {
*pOutColor = Colorf_to_D3DCOLOR(*pInColor); *pOutColor = Colorf_to_D3DCOLOR(*pInColor);
} }
} else { } else {
for (int i=0;i<cNumColors;i++,pInColor++,pOutColor++) { for (uint i=0;i<cNumColors;i++,pInColor++,pOutColor++) {
transform_color(*pInColor,*pOutColor); transform_color(*pInColor,*pOutColor);
} }
} }
@ -3093,8 +3093,8 @@ draw_trifan(GeomTrifan *geom, GeomContext *gc) {
void DXGraphicsStateGuardian:: void DXGraphicsStateGuardian::
draw_multitri(Geom *geom, D3DPRIMITIVETYPE trilisttype) { draw_multitri(Geom *geom, D3DPRIMITIVETYPE trilisttype) {
int nPrims = geom->get_num_prims(); DWORD nPrims = geom->get_num_prims();
const int *pLengthArr = geom->get_lengths(); const uint *pLengthArr = (const uint *) ((const int *)geom->get_lengths());
HRESULT hr; HRESULT hr;
if(nPrims==0) { if(nPrims==0) {
@ -3186,7 +3186,7 @@ draw_multitri(Geom *geom, D3DPRIMITIVETYPE trilisttype) {
// iterate through the triangle primitives // iterate through the triangle primitives
for (int i = 0; i < nPrims; i++) { for (uint i = 0; i < nPrims; i++) {
if (_perPrim & PER_COLOR) { if (_perPrim & PER_COLOR) {
GET_NEXT_COLOR(); GET_NEXT_COLOR();
@ -3265,7 +3265,7 @@ draw_multitri(Geom *geom, D3DPRIMITIVETYPE trilisttype) {
DWORD cTotalVerts=0; DWORD cTotalVerts=0;
for (int i=0;i<nPrims;i++) { for (uint i=0;i<nPrims;i++) {
cTotalVerts+= pLengthArr[i]; cTotalVerts+= pLengthArr[i];
} }
@ -3293,12 +3293,12 @@ draw_multitri(Geom *geom, D3DPRIMITIVETYPE trilisttype) {
// must use tmp array to duplicate-expand per-prim norms to per-vert norms // must use tmp array to duplicate-expand per-prim norms to per-vert norms
Normalf *pOutVec = pExpandedNormalArray; Normalf *pOutVec = pExpandedNormalArray;
Normalf *pInVec=norms; Normalf *pInVec=norms;
const int *pLengths=pLengthArr; const uint *pLengths=pLengthArr;
nassertv(norms.size()>=nPrims); nassertv(norms.size()>=nPrims);
for (int i=0;i<nPrims;i++,pInVec++,pLengths++) { for (uint i=0;i<nPrims;i++,pInVec++,pLengths++) {
for (int j=0;j<(*pLengths);j++,pOutVec++) { for (uint j=0;j<(*pLengths);j++,pOutVec++) {
*pOutVec = *pInVec; *pOutVec = *pInVec;
} }
} }
@ -3344,11 +3344,11 @@ draw_multitri(Geom *geom, D3DPRIMITIVETYPE trilisttype) {
NeededShadeMode = D3DSHADE_GOURAUD; NeededShadeMode = D3DSHADE_GOURAUD;
if(!(_color_transform_enabled || _alpha_transform_enabled)) { if(!(_color_transform_enabled || _alpha_transform_enabled)) {
for (int i=0;i<cTotalVerts;i++,pInColor++,pOutColor++) { for (uint i=0;i<cTotalVerts;i++,pInColor++,pOutColor++) {
*pOutColor = Colorf_to_D3DCOLOR(*pInColor); *pOutColor = Colorf_to_D3DCOLOR(*pInColor);
} }
} else { } else {
for (int i=0;i<cTotalVerts;i++,pInColor++,pOutColor++) { for (uint i=0;i<cTotalVerts;i++,pInColor++,pOutColor++) {
transform_color(*pInColor,*pOutColor); transform_color(*pInColor,*pOutColor);
} }
} }
@ -3360,19 +3360,19 @@ draw_multitri(Geom *geom, D3DPRIMITIVETYPE trilisttype) {
// could save 2 clr writes per strip/fan in flat shade mode but not going to bother here // could save 2 clr writes per strip/fan in flat shade mode but not going to bother here
if(!(_color_transform_enabled || _alpha_transform_enabled)) { if(!(_color_transform_enabled || _alpha_transform_enabled)) {
for (int j=0;j<nPrims;j++,pInColor++) { for (uint j=0;j<nPrims;j++,pInColor++) {
D3DCOLOR lastcolr = Colorf_to_D3DCOLOR(*pInColor); D3DCOLOR lastcolr = Colorf_to_D3DCOLOR(*pInColor);
DWORD cStripLength=pLengthArr[j]; DWORD cStripLength=pLengthArr[j];
for (int i=0;i<cStripLength;i++,pOutColor++) { for (uint i=0;i<cStripLength;i++,pOutColor++) {
*pOutColor = lastcolr; *pOutColor = lastcolr;
} }
} }
} else { } else {
for (int j=0;j<nPrims;j++,pInColor++) { for (uint j=0;j<nPrims;j++,pInColor++) {
D3DCOLOR lastcolr; D3DCOLOR lastcolr;
transform_color(*pInColor,lastcolr); transform_color(*pInColor,lastcolr);
DWORD cStripLength=pLengthArr[j]; DWORD cStripLength=pLengthArr[j];
for (int i=0;i<cStripLength;i++,pOutColor++) { for (uint i=0;i<cStripLength;i++,pOutColor++) {
*pOutColor = lastcolr; *pOutColor = lastcolr;
} }
} }
@ -3384,7 +3384,7 @@ draw_multitri(Geom *geom, D3DPRIMITIVETYPE trilisttype) {
#define MULTITRI_COLORCOPY_LOOP \ #define MULTITRI_COLORCOPY_LOOP \
DWORD cCurStripColorCnt=pLengthArr[j]-cNumMoreVertsthanTris; \ DWORD cCurStripColorCnt=pLengthArr[j]-cNumMoreVertsthanTris; \
for (int i=0;i<cCurStripColorCnt;i++,pInColor++,pOutColor++) for (uint i=0;i<cCurStripColorCnt;i++,pInColor++,pOutColor++)
#define COLOR_CONVERT_COPY_STMT {*pOutColor = Colorf_to_D3DCOLOR(*pInColor);} #define COLOR_CONVERT_COPY_STMT {*pOutColor = Colorf_to_D3DCOLOR(*pInColor);}
#define COLOR_CONVERT_XFORM_STMT {transform_color(*pInColor,*pOutColor);} #define COLOR_CONVERT_XFORM_STMT {transform_color(*pInColor,*pOutColor);}
@ -3394,14 +3394,14 @@ draw_multitri(Geom *geom, D3DPRIMITIVETYPE trilisttype) {
/* FLAT shade mode. for tristrips, skip writing last 2 verts. */ \ /* FLAT shade mode. for tristrips, skip writing last 2 verts. */ \
/* for trifans, skip first and last verts */ \ /* for trifans, skip first and last verts */ \
if (trilisttype==D3DPT_TRIANGLESTRIP) { \ if (trilisttype==D3DPT_TRIANGLESTRIP) { \
for (int j=0;j<nPrims;j++) { \ for (uint j=0;j<nPrims;j++) { \
MULTITRI_COLORCOPY_LOOP { \ MULTITRI_COLORCOPY_LOOP { \
COLOR_COPYSTMT; \ COLOR_COPYSTMT; \
} \ } \
pOutColor+=cNumMoreVertsthanTris; \ pOutColor+=cNumMoreVertsthanTris; \
} \ } \
} else { /* trifan */ \ } else { /* trifan */ \
for (int j=0;j<nPrims;j++) { \ for (uint j=0;j<nPrims;j++) { \
pOutColor++; \ pOutColor++; \
MULTITRI_COLORCOPY_LOOP { \ MULTITRI_COLORCOPY_LOOP { \
COLOR_COPYSTMT; \ COLOR_COPYSTMT; \
@ -3411,7 +3411,7 @@ draw_multitri(Geom *geom, D3DPRIMITIVETYPE trilisttype) {
} \ } \
} else { /* GOURAUD shademode (due to presence of normals) */ \ } else { /* GOURAUD shademode (due to presence of normals) */ \
if (trilisttype==D3DPT_TRIANGLESTRIP) { \ if (trilisttype==D3DPT_TRIANGLESTRIP) { \
for (int j=0;j<nPrims;j++) { \ for (uint j=0;j<nPrims;j++) { \
MULTITRI_COLORCOPY_LOOP { \ MULTITRI_COLORCOPY_LOOP { \
COLOR_COPYSTMT; \ COLOR_COPYSTMT; \
} \ } \
@ -3420,7 +3420,7 @@ draw_multitri(Geom *geom, D3DPRIMITIVETYPE trilisttype) {
*pOutColor++ = lastcolr; \ *pOutColor++ = lastcolr; \
} \ } \
} else { /* trifan */ \ } else { /* trifan */ \
for (int j=0;j<nPrims;j++) { \ for (uint j=0;j<nPrims;j++) { \
COLOR_COPYSTMT; \ COLOR_COPYSTMT; \
pOutColor++; \ pOutColor++; \
MULTITRI_COLORCOPY_LOOP { \ MULTITRI_COLORCOPY_LOOP { \
@ -3476,8 +3476,8 @@ draw_multitri(Geom *geom, D3DPRIMITIVETYPE trilisttype) {
set_shademode(NeededShadeMode); set_shademode(NeededShadeMode);
for (int j=0;j<nPrims;j++) { for (uint j=0;j<nPrims;j++) {
const int cCurNumStripVerts = pLengthArr[j]; const uint cCurNumStripVerts = pLengthArr[j];
hr = _d3dDevice->DrawPrimitiveStrided(trilisttype, fvf_flags, &dps_data, cCurNumStripVerts, NULL); hr = _d3dDevice->DrawPrimitiveStrided(trilisttype, fvf_flags, &dps_data, cCurNumStripVerts, NULL);
TestDrawPrimFailure(DrawPrimStrided,hr,_pDD,cCurNumStripVerts,cCurNumStripVerts-2); TestDrawPrimFailure(DrawPrimStrided,hr,_pDD,cCurNumStripVerts,cCurNumStripVerts-2);
@ -7149,7 +7149,7 @@ prepare_geom_node(GeomNode *node) {
void DXGraphicsStateGuardian:: void DXGraphicsStateGuardian::
draw_geom_node(GeomNode *node, GeomNodeContext *gnc) { draw_geom_node(GeomNode *node, GeomNodeContext *gnc) {
int i,num_geoms = node->get_num_geoms(); uint i,num_geoms = node->get_num_geoms();
if (gnc == (GeomNodeContext *)NULL) { if (gnc == (GeomNodeContext *)NULL) {

4
panda/src/wgldisplay/wglGraphicsWindow.cxx
View File

@ -1115,8 +1115,8 @@ verify_window_sizes(unsigned int numsizes,unsigned int *dimen) {
// could do linear time with some kind of STL hash container I guess // could do linear time with some kind of STL hash container I guess
DEVMODE dm; DEVMODE dm;
int modenum=0; uint modenum=0;
int goodmodes=0; uint goodmodes=0;
unsigned int *cur_dim_pair=dimen; unsigned int *cur_dim_pair=dimen;
for(;modenum<numsizes;modenum++,cur_dim_pair+=2) { for(;modenum<numsizes;modenum++,cur_dim_pair+=2) {
bool bIsGoodmode; bool bIsGoodmode;