From fd3c8843d0acc1d27a9bcaea475ea864508fb64d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Constantin=20Ri=DF?= <constantin.riss@dre.de>
Date: Tue, 19 Jan 2010 20:06:14 +0100
Subject: .....

---
 Temparray.h | 30 +++---------------------------
 1 file changed, 3 insertions(+), 27 deletions(-)

(limited to 'Temparray.h')

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_ */
-- 
cgit v1.2.3