diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-08-15 20:36:25 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-08-15 20:36:25 +0400 |
commit | 314b14301fd565b93bbb75697c29b109eacf813d (patch) | |
tree | f3e759c2040a58928975ca379f4eada8f171a915 /intern/smoke | |
parent | de330b0d5c341a86ad3413c420edd2702288d1e0 (diff) |
2.5: warning fixes
Directories intern/ and source/blender/ now compile warning
free again here with scons/gcc.
Diffstat (limited to 'intern/smoke')
-rw-r--r-- | intern/smoke/intern/FLUID_3D_SOLVERS.cpp | 9 | ||||
-rw-r--r-- | intern/smoke/intern/VEC3.h | 2 | ||||
-rw-r--r-- | intern/smoke/intern/WAVELET_NOISE.h | 4 | ||||
-rw-r--r-- | intern/smoke/intern/smoke_API.cpp | 14 |
4 files changed, 19 insertions, 10 deletions
diff --git a/intern/smoke/intern/FLUID_3D_SOLVERS.cpp b/intern/smoke/intern/FLUID_3D_SOLVERS.cpp index 9d546009a8c..a35beaa05d7 100644 --- a/intern/smoke/intern/FLUID_3D_SOLVERS.cpp +++ b/intern/smoke/intern/FLUID_3D_SOLVERS.cpp @@ -26,7 +26,8 @@ void FLUID_3D::solvePressurePre(float* field, float* b, unsigned char* skip) { - size_t x, y, z, index; + int x, y, z; + size_t index; // i = 0 int i = 0; @@ -197,7 +198,8 @@ void FLUID_3D::solvePressurePre(float* field, float* b, unsigned char* skip) ////////////////////////////////////////////////////////////////////// void FLUID_3D::solvePressure(float* field, float* b, unsigned char* skip) { - size_t x, y, z, index; + int x, y, z; + size_t index; // i = 0 int i = 0; @@ -348,7 +350,8 @@ void FLUID_3D::solvePressure(float* field, float* b, unsigned char* skip) ////////////////////////////////////////////////////////////////////// void FLUID_3D::solveHeat(float* field, float* b, unsigned char* skip) { - size_t x, y, z, index; + int x, y, z; + size_t index; const float heatConst = _dt * _heatDiffusion / (_dx * _dx); // i = 0 diff --git a/intern/smoke/intern/VEC3.h b/intern/smoke/intern/VEC3.h index 607f68279a2..98c4555ac5f 100644 --- a/intern/smoke/intern/VEC3.h +++ b/intern/smoke/intern/VEC3.h @@ -926,7 +926,9 @@ inline void hsvToRgb( VECTOR_TYPE &V ) //! global string for formatting vector output in utilities.cpp //extern const char *globVecFormatStr; +#if 0 static const char *globVecFormatStr = "[%6.4f,%6.4f,%6.4f]"; +#endif /************************************************************************* Outputs the object in human readable form using the format diff --git a/intern/smoke/intern/WAVELET_NOISE.h b/intern/smoke/intern/WAVELET_NOISE.h index 493ed1642fc..4c2e7514af7 100644 --- a/intern/smoke/intern/WAVELET_NOISE.h +++ b/intern/smoke/intern/WAVELET_NOISE.h @@ -220,7 +220,7 @@ static bool loadTile(float* const noiseTileData, std::string filename) } // dimensions - int gridSize = noiseTileSize * noiseTileSize * noiseTileSize; + size_t gridSize = noiseTileSize * noiseTileSize * noiseTileSize; // noiseTileData memory is managed by caller size_t bread = fread((void*)noiseTileData, sizeof(float), gridSize, file); @@ -228,7 +228,7 @@ static bool loadTile(float* const noiseTileData, std::string filename) printf("Noise tile file '%s' loaded.\n", filename.c_str()); if (bread != gridSize) { - printf("loadTile: Noise tile '%s' is wrong size %d.\n", filename.c_str(), bread); + printf("loadTile: Noise tile '%s' is wrong size %d.\n", filename.c_str(), (int)bread); return false; } return true; diff --git a/intern/smoke/intern/smoke_API.cpp b/intern/smoke/intern/smoke_API.cpp index 7f90971f14d..2e95a576eaf 100644 --- a/intern/smoke/intern/smoke_API.cpp +++ b/intern/smoke/intern/smoke_API.cpp @@ -93,15 +93,16 @@ extern "C" void smoke_initBlenderRNA(FLUID_3D *fluid, float *alpha, float *beta) extern "C" void smoke_dissolve(FLUID_3D *fluid, int speed, int log) { float *density = fluid->_density; - float *densityOld = fluid->_densityOld; + //float *densityOld = fluid->_densityOld; float *heat = fluid->_heat; if(log) { /* max density/speed = dydx */ float dydx = 1.0 / (float)speed; + size_t size= fluid->_xRes * fluid->_yRes * fluid->_zRes; - for(size_t i = 0; i < fluid->_xRes * fluid->_yRes * fluid->_zRes; i++) + for(size_t i = 0; i < size; i++) { density[i] *= (1.0 - dydx); @@ -118,8 +119,9 @@ extern "C" void smoke_dissolve(FLUID_3D *fluid, int speed, int log) { /* max density/speed = dydx */ float dydx = 1.0 / (float)speed; + size_t size= fluid->_xRes * fluid->_yRes * fluid->_zRes; - for(size_t i = 0; i < fluid->_xRes * fluid->_yRes * fluid->_zRes; i++) + for(size_t i = 0; i < size; i++) { density[i] -= dydx; @@ -144,8 +146,9 @@ extern "C" void smoke_dissolve_wavelet(WTURBULENCE *wt, int speed, int log) { /* max density/speed = dydx */ float dydx = 1.0 / (float)speed; + size_t size= r[0] * r[1] * r[2]; - for(size_t i = 0; i < r[0] * r[1] * r[2]; i++) + for(size_t i = 0; i < size; i++) { density[i] *= (1.0 - dydx); @@ -157,8 +160,9 @@ extern "C" void smoke_dissolve_wavelet(WTURBULENCE *wt, int speed, int log) { /* max density/speed = dydx */ float dydx = 1.0 / (float)speed; + size_t size= r[0] * r[1] * r[2]; - for(size_t i = 0; i < r[0] * r[1] * r[2]; i++) + for(size_t i = 0; i < size; i++) { density[i] -= dydx; |