diff options
author | Constantin Riß <constantin.riss@dre.de> | 2010-01-19 20:06:14 +0100 |
---|---|---|
committer | Constantin Riß <constantin.riss@dre.de> | 2010-01-19 20:06:14 +0100 |
commit | fd3c8843d0acc1d27a9bcaea475ea864508fb64d (patch) | |
tree | e236bafe40a26aa5396d8c9dcc03d46b975ddaf3 /Temparray.h | |
parent | 4de0fc7184f74700b68f92ce2acbd54b39b4fedf (diff) | |
download | c3d-fd3c8843d0acc1d27a9bcaea475ea864508fb64d.tar c3d-fd3c8843d0acc1d27a9bcaea475ea864508fb64d.zip |
.....
Diffstat (limited to 'Temparray.h')
-rw-r--r-- | Temparray.h | 30 |
1 files changed, 3 insertions, 27 deletions
diff --git a/Temparray.h b/Temparray.h index 24cb95d..ba4e8e8 100644 --- a/Temparray.h +++ b/Temparray.h @@ -20,20 +20,14 @@ class Temparray float& temperaturenew(int x, int y, int z, int line, int pos) { return temparraynew[x*sy*sz*6*4 + y*sz*6*4 + z*6*4 + line*4 + pos]; } -/* void deactivateCube(int x, int y, int z){ - for(int i=0; i<6; i++){ - for(int j=0; j<4; j++){ - setTemp(-100, x, y, z, i, j); - } - } - }*/ std::list<Triangle> getTriangles(); + void coloring(); private: float *temparrayold, *temparraynew; Cubehole *cubearray; int sx, sy, sz; - float averagetemp; + float averagetemp, earthtemp; Cubehole& cubehole(int x, int y, int z, int line) { return cubearray[x*sy*sz*6 + y*sz*6 + z*6 + line]; @@ -58,28 +52,10 @@ class Temparray } } } + earthtemp=8; temperatureold(2, 2, 2, 2, 2) = 90; temperaturenew(2, 2, 2, 2, 2) = 90; } -/* void calcAverage(){ - float tempcache = 0; - int times = 0; - for(int i=0; i<sx; i++){ - for(int j=0; j<sy; j++){ - for(int k=0; k<sz; k++){ - for(int l=0; l<6; l++){ - for(int m=0; m<4; m++){ - if(temperature(i, j, k, l, m) != -100){ - tempcache += temperature(i, j, k, l, m); - ++times; - } - } - } - } - } - } - averagetemp = tempcache/times; - }*/ }; #endif /* _TEMPARRAY_H_ */ |