summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorConstantin Riß <constantin.riss@dre.de>2010-02-05 22:01:57 +0100
committerConstantin Riß <constantin.riss@dre.de>2010-02-05 22:01:57 +0100
commit7fdd05d8c937fab5816267f49a53dcf1f70c6a33 (patch)
tree5d35d51f1512998b754ac64f1397f0d6dbd2cc3f
parentb71c8bfd17097c3e0c7711a41893b631cc104203 (diff)
downloadc3d-7fdd05d8c937fab5816267f49a53dcf1f70c6a33.tar
c3d-7fdd05d8c937fab5816267f49a53dcf1f70c6a33.zip
.........
-rw-r--r--Temparray.cpp10
-rw-r--r--main.cpp1
2 files changed, 6 insertions, 5 deletions
diff --git a/Temparray.cpp b/Temparray.cpp
index dfc001e..ddbcc25 100644
--- a/Temparray.cpp
+++ b/Temparray.cpp
@@ -469,13 +469,13 @@ void Temparray::coloring() {
for(int k=0; k<sz; ++k){
for(int l=0; l<6; ++l){
for(int m=0; m<4; ++m){
- if(temperaturenew(i, j, k, l, m) <= averagetemp/2) b[m] = 1;
- else if(temperaturenew(i, j, k, l, m) < averagetemp)
- b[m] = 1/(averagetemp/2+temperaturenew(i, j, k, l, m));
+ //if(temperaturenew(i, j, k, l, m) <= averagetemp/2) b[m] = 1;
+ //else if(temperaturenew(i, j, k, l, m) < averagetemp)
+ b[m] = 1;//1/(averagetemp/2+temperaturenew(i, j, k, l, m));
- g[m]=0;
+ g[m]=1;
- if(temperaturenew(i, j, k, l, m) >= 100-averagetemp/2) r[m] = 1;
+ //if(temperaturenew(i, j, k, l, m) >= 100-averagetemp/2) r[m] = 1;
// r[m]=0;
}
cubehole(i, j, k, l).setColor(vmml::vec4f(r[0], g[0], b[0], 1.0),
diff --git a/main.cpp b/main.cpp
index f2c7ddb..8658424 100644
--- a/main.cpp
+++ b/main.cpp
@@ -4,6 +4,7 @@
#ifdef _WIN32
#else
+#include <stdio.h>
#include <iostream>
#include <X11/X.h>
#include <GL/glx.h>