dhewm/dhewm3
0
0
Fork 0
mirror of https://github.com/dhewm/dhewm3.git synced 2024-11-23 12:53:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #342 from turol/warnings

Browse source 
Fix some warnings
This commit is contained in:
Daniel Gibson 2021-04-08 17:22:33 +02:00 committed by GitHub
commit 81a8611aba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 47 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
neo/idlib/geometry/Surface.h
View file

@ -123,7 +123,9 @@ idSurface::idSurface
ID_INLINE idSurface::idSurface( const idDrawVert *verts, const int numVerts, const int *indexes, const int numIndexes ) { ID_INLINE idSurface::idSurface( const idDrawVert *verts, const int numVerts, const int *indexes, const int numIndexes ) {
assert( verts != NULL && indexes != NULL && numVerts > 0 && numIndexes > 0 ); assert( verts != NULL && indexes != NULL && numVerts > 0 && numIndexes > 0 );
this->verts.SetNum( numVerts ); this->verts.SetNum( numVerts );
memcpy( this->verts.Ptr(), verts, numVerts * sizeof( verts[0] ) ); for (int i = 0; i < numVerts; i++) {
this->verts[i] = verts[i];
}
this->indexes.SetNum( numIndexes ); this->indexes.SetNum( numIndexes );
memcpy( this->indexes.Ptr(), indexes, numIndexes * sizeof( indexes[0] ) ); memcpy( this->indexes.Ptr(), indexes, numIndexes * sizeof( indexes[0] ) );
GenerateEdgeIndexes(); GenerateEdgeIndexes();

6
neo/idlib/geometry/TraceModel.cpp
View file

@ -1164,6 +1164,7 @@ int idTraceModel::GetOrderedSilhouetteEdges( const int edgeIsSilEdge[MAX_TRACEMO
int i, j, edgeNum, numSilEdges, nextSilVert; int i, j, edgeNum, numSilEdges, nextSilVert;
int unsortedSilEdges[MAX_TRACEMODEL_EDGES]; int unsortedSilEdges[MAX_TRACEMODEL_EDGES];
unsortedSilEdges[0] = 0;
numSilEdges = 0; numSilEdges = 0;
for ( i = 1; i <= numEdges; i++ ) { for ( i = 1; i <= numEdges; i++ ) {
if ( edgeIsSilEdge[i] ) { if ( edgeIsSilEdge[i] ) {
@ -1409,7 +1410,10 @@ void idTraceModel::VolumeIntegrals( struct volumeIntegrals_s &integrals ) const
int i, a, b, c; int i, a, b, c;
float nx, ny, nz; float nx, ny, nz;
memset( &integrals, 0, sizeof(volumeIntegrals_t) ); integrals.T0 = 0.0f;
integrals.T1.Zero();
integrals.T2.Zero();
integrals.TP.Zero();
for ( i = 0; i < numPolys; i++ ) { for ( i = 0; i < numPolys; i++ ) {
poly = &polys[i]; poly = &polys[i];

44
neo/idlib/math/Matrix.h
View file

@ -134,7 +134,8 @@ ID_INLINE idMat2::idMat2( const float xx, const float xy, const float yx, const
} }
ID_INLINE idMat2::idMat2( const float src[ 2 ][ 2 ] ) { ID_INLINE idMat2::idMat2( const float src[ 2 ][ 2 ] ) {
memcpy( mat, src, 2 * 2 * sizeof( float ) ); mat[0].x = src[0][0]; mat[0].y = src[0][1];
mat[1].x = src[1][0]; mat[1].y = src[1][1];
} }
ID_INLINE const idVec2 &idMat2::operator[]( int index ) const { ID_INLINE const idVec2 &idMat2::operator[]( int index ) const {
@ -438,7 +439,9 @@ ID_INLINE idMat3::idMat3( const float xx, const float xy, const float xz, const
} }
ID_INLINE idMat3::idMat3( const float src[ 3 ][ 3 ] ) { ID_INLINE idMat3::idMat3( const float src[ 3 ][ 3 ] ) {
memcpy( mat, src, 3 * 3 * sizeof( float ) ); mat[0].x = src[0][0]; mat[0].y = src[0][1]; mat[0].z = src[0][2];
mat[1].x = src[1][0]; mat[1].y = src[1][1]; mat[1].z = src[1][2];
mat[2].x = src[2][0]; mat[2].y = src[2][1]; mat[2].z = src[2][2];
} }
ID_INLINE const idVec3 &idMat3::operator[]( int index ) const { ID_INLINE const idVec3 &idMat3::operator[]( int index ) const {
@ -595,7 +598,9 @@ ID_INLINE bool idMat3::operator!=( const idMat3 &a ) const {
} }
ID_INLINE void idMat3::Zero( void ) { ID_INLINE void idMat3::Zero( void ) {
memset( mat, 0, sizeof( idMat3 ) ); mat[0].x = 0.0f; mat[0].y = 0.0f; mat[0].z = 0.0f;
mat[1].x = 0.0f; mat[1].y = 0.0f; mat[1].z = 0.0f;
mat[2].x = 0.0f; mat[2].y = 0.0f; mat[2].z = 0.0f;
} }
ID_INLINE void idMat3::Identity( void ) { ID_INLINE void idMat3::Identity( void ) {
@ -881,7 +886,10 @@ ID_INLINE idMat4::idMat4( const idMat3 &rotation, const idVec3 &translation ) {
} }
ID_INLINE idMat4::idMat4( const float src[ 4 ][ 4 ] ) { ID_INLINE idMat4::idMat4( const float src[ 4 ][ 4 ] ) {
memcpy( mat, src, 4 * 4 * sizeof( float ) ); mat[0].x = src[0][0]; mat[0].y = src[0][1]; mat[0].z = src[0][2]; mat[0].w = src[0][3];
mat[1].x = src[1][0]; mat[1].y = src[1][1]; mat[1].z = src[1][2]; mat[1].w = src[1][3];
mat[2].x = src[2][0]; mat[2].y = src[2][1]; mat[2].z = src[2][2]; mat[2].w = src[2][3];
mat[3].x = src[3][0]; mat[3].y = src[3][1]; mat[3].z = src[3][2]; mat[3].w = src[3][3];
} }
ID_INLINE const idVec4 &idMat4::operator[]( int index ) const { ID_INLINE const idVec4 &idMat4::operator[]( int index ) const {
@ -1057,7 +1065,10 @@ ID_INLINE bool idMat4::operator!=( const idMat4 &a ) const {
} }
ID_INLINE void idMat4::Zero( void ) { ID_INLINE void idMat4::Zero( void ) {
memset( mat, 0, sizeof( idMat4 ) ); mat[0].x = 0.0f; mat[0].y = 0.0f; mat[0].z = 0.0f; mat[0].w = 0.0f;
mat[1].x = 0.0f; mat[1].y = 0.0f; mat[1].z = 0.0f; mat[1].w = 0.0f;
mat[2].x = 0.0f; mat[2].y = 0.0f; mat[2].z = 0.0f; mat[2].w = 0.0f;
mat[3].x = 0.0f; mat[3].y = 0.0f; mat[3].z = 0.0f; mat[3].w = 0.0f;
} }
ID_INLINE void idMat4::Identity( void ) { ID_INLINE void idMat4::Identity( void ) {
@ -1219,7 +1230,11 @@ ID_INLINE idMat5::idMat5( void ) {
} }
ID_INLINE idMat5::idMat5( const float src[ 5 ][ 5 ] ) { ID_INLINE idMat5::idMat5( const float src[ 5 ][ 5 ] ) {
memcpy( mat, src, 5 * 5 * sizeof( float ) ); mat[0].x = src[0][0]; mat[0].y = src[0][1]; mat[0].z = src[0][2]; mat[0].s = src[0][3]; mat[0].t = src[0][4];
mat[1].x = src[1][0]; mat[1].y = src[1][1]; mat[1].z = src[1][2]; mat[1].s = src[1][3]; mat[1].t = src[1][4];
mat[2].x = src[2][0]; mat[2].y = src[2][1]; mat[2].z = src[2][2]; mat[2].s = src[2][3]; mat[2].t = src[2][4];
mat[3].x = src[3][0]; mat[3].y = src[3][1]; mat[3].z = src[3][2]; mat[3].s = src[3][3]; mat[3].t = src[3][4];
mat[4].x = src[4][0]; mat[4].y = src[4][1]; mat[4].z = src[4][2]; mat[4].s = src[4][3]; mat[4].t = src[4][4];
} }
ID_INLINE idMat5::idMat5( const idVec5 &v0, const idVec5 &v1, const idVec5 &v2, const idVec5 &v3, const idVec5 &v4 ) { ID_INLINE idMat5::idMat5( const idVec5 &v0, const idVec5 &v1, const idVec5 &v2, const idVec5 &v3, const idVec5 &v4 ) {
@ -1382,7 +1397,11 @@ ID_INLINE bool idMat5::operator!=( const idMat5 &a ) const {
} }
ID_INLINE void idMat5::Zero( void ) { ID_INLINE void idMat5::Zero( void ) {
memset( mat, 0, sizeof( idMat5 ) ); mat[0].x = 0.0f; mat[0].y = 0.0f; mat[0].z = 0.0f; mat[0].s = 0.0f; mat[0].t = 0.0f;
mat[1].x = 0.0f; mat[1].y = 0.0f; mat[1].z = 0.0f; mat[1].s = 0.0f; mat[1].t = 0.0f;
mat[2].x = 0.0f; mat[2].y = 0.0f; mat[2].z = 0.0f; mat[2].s = 0.0f; mat[2].t = 0.0f;
mat[3].x = 0.0f; mat[3].y = 0.0f; mat[3].z = 0.0f; mat[3].s = 0.0f; mat[3].t = 0.0f;
mat[4].x = 0.0f; mat[4].y = 0.0f; mat[4].z = 0.0f; mat[4].s = 0.0f; mat[4].t = 0.0f;
} }
ID_INLINE void idMat5::Identity( void ) { ID_INLINE void idMat5::Identity( void ) {
@ -1536,7 +1555,12 @@ ID_INLINE idMat6::idMat6( const idVec6 &v0, const idVec6 &v1, const idVec6 &v2,
} }
ID_INLINE idMat6::idMat6( const float src[ 6 ][ 6 ] ) { ID_INLINE idMat6::idMat6( const float src[ 6 ][ 6 ] ) {
memcpy( mat, src, 6 * 6 * sizeof( float ) ); memcpy( mat[0].ToFloatPtr(), src[0], 6 * sizeof( float ) );
memcpy( mat[1].ToFloatPtr(), src[1], 6 * sizeof( float ) );
memcpy( mat[2].ToFloatPtr(), src[2], 6 * sizeof( float ) );
memcpy( mat[3].ToFloatPtr(), src[3], 6 * sizeof( float ) );
memcpy( mat[4].ToFloatPtr(), src[4], 6 * sizeof( float ) );
memcpy( mat[5].ToFloatPtr(), src[5], 6 * sizeof( float ) );
} }
ID_INLINE const idVec6 &idMat6::operator[]( int index ) const { ID_INLINE const idVec6 &idMat6::operator[]( int index ) const {
@ -1699,7 +1723,9 @@ ID_INLINE bool idMat6::operator!=( const idMat6 &a ) const {
} }
ID_INLINE void idMat6::Zero( void ) { ID_INLINE void idMat6::Zero( void ) {
memset( mat, 0, sizeof( idMat6 ) ); for (int i = 0; i < 6; i++) {
mat[i].Zero();
}
} }
ID_INLINE void idMat6::Identity( void ) { ID_INLINE void idMat6::Identity( void ) {

8
neo/renderer/Cinematic.cpp
View file

@ -939,8 +939,8 @@ unsigned short idCinematicLocal::yuv_to_rgb( int y, int u, int v ) {
g = (YY + ROQ_UG_tab[u] + ROQ_VG_tab[v]) >> 8; g = (YY + ROQ_UG_tab[u] + ROQ_VG_tab[v]) >> 8;
b = (YY + ROQ_UB_tab[u]) >> 9; b = (YY + ROQ_UB_tab[u]) >> 9;
if (r<0) r = 0; if (g<0) g = 0; if (b<0) b = 0; if (r <0 ) { r = 0; } if (g < 0) { g = 0; } if (b < 0) { b = 0; }
if (r > 31) r = 31; if (g > 63) g = 63; if (b > 31) b = 31; if (r > 31) { r = 31; } if (g > 63) { g = 63; } if (b > 31) { b = 31; }
return (unsigned short)((r<<11)+(g<<5)+(b)); return (unsigned short)((r<<11)+(g<<5)+(b));
} }
@ -957,8 +957,8 @@ unsigned int idCinematicLocal::yuv_to_rgb24( int y, int u, int v ) {
g = (YY + ROQ_UG_tab[u] + ROQ_VG_tab[v]) >> 6; g = (YY + ROQ_UG_tab[u] + ROQ_VG_tab[v]) >> 6;
b = (YY + ROQ_UB_tab[u]) >> 6; b = (YY + ROQ_UB_tab[u]) >> 6;
if (r<0) r = 0; if (g<0) g = 0; if (b<0) b = 0; if (r < 0) { r = 0; } if (g < 0) { g = 0; } if (b < 0) { b = 0; }
if (r > 255) r = 255; if (g > 255) g = 255; if (b > 255) b = 255; if (r > 255) { r = 255; } if (g > 255) { g = 255; } if (b > 255) { b = 255; }
return LittleInt((r)+(g<<8)+(b<<16)); return LittleInt((r)+(g<<8)+(b<<16));
} }