diff options
Diffstat (limited to 'Temparray.cpp')
| -rw-r--r-- | Temparray.cpp | 43 |
1 files changed, 27 insertions, 16 deletions
diff --git a/Temparray.cpp b/Temparray.cpp index bb3596a..af46f8d 100644 --- a/Temparray.cpp +++ b/Temparray.cpp @@ -1,25 +1,35 @@ #include "Temparray.h" Temparray::Temparray(float initialtemp, int x0, int y0, int z0){ - float *temperature = new float[x0*y0*z0*6*4 + y0*z0*6*4 + z0*6*4 + 6*4 + 4]; - Cubehole *cubearray = new Cubehole[x0*y0*z0*6 + y0*z0*64 + z0*6 + 6]; + temparray = new float[x0*y0*z0*6*4]; + cubearray = new Cubehole[x0*y0*z0*6]; + + sx = x0; + sy = y0; + sz = z0; + tempInit(initialtemp, x0, y0, z0); - size[0] = x0; size[1] = y0; size[2] = z0; // static const float pos[5] = {-2.0, -1.0, 0.0, 1.0, 2.0}; - float x1, y1, z1; for(int i = 0; i < x0; ++i) { for(int j = 0; j < y0; ++j) { for(int k = 0; k < z0; ++k) { for(int l = 0; l < 6; ++l) { - cubearray[i*y0*z0*6 + j*z0*6 + k*6 + l].setSize((6-l)/6, (6-l)/6, (6-l)/6, (5-l)/6, (5-l)/6); - if(x0 % 2 == 0) x1 = -(x0/2)+i+0.5; - else if(x0 % 2 == 1) x1 = -(x0-1)/2+i; - if(y0 % 2 == 0) y1 = -(y0/2)+i+0.5; - else if(y0 % 2 == 1) y1 = -(y0-1)/2+i; - if(z0 % 2 == 0) z1 = -(z0/2)+i+0.5; - else if(z0 % 2 == 1) z1 = -(z0-1)/2+i; - cubearray[i*y0*z0*6 + j*z0*6 + k*6 + l].setPos(x1, y1, z1); + cubehole(i, j, k, l).setSize((6-l)/6*0.9, 3, (6-l)/6*0.9, (5-l)/6*0.9, (5-l)/6*0.9); + + float x, y, z; + if(x0 % 2 == 0) x = -(x0/2)+i+0.5; + else if(x0 % 2 == 1) x = -(x0-1)/2+i; + if(y0 % 2 == 0) y = -(y0/2)+j+0.5; + else if(y0 % 2 == 1) y = -(y0-1)/2+j; + if(z0 % 2 == 0) z = -(z0/2)+k+0.5; + else if(z0 % 2 == 1) z = -(z0-1)/2+k; + cubehole(i, j, k, l).setPos(x, y, z); + + cubehole(i, j, k, l).setColor(vmml::vec4f(1.0, 0.5, 1.0, 1.0), + vmml::vec4f(0.5, 0.5, 1.0, 1.0), + vmml::vec4f(1.0, 0.5, 0.0, 1.0), + vmml::vec4f(0.0, 0.5, 0.0, 1.0)); } } } @@ -29,15 +39,16 @@ Temparray::Temparray(float initialtemp, int x0, int y0, int z0){ std::list<Triangle> Temparray::getTriangles(){ std::list<Triangle> triangles; - for(int i = 0; i < size[0]; ++i) { - for(int j = 0; j < size[1]; ++j) { - for(int k = 0; k < size[2]; ++k) { + 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) { - std::list<Triangle> t = cubearray[i*size[1]*size[2]*6 + j*size[2]*6 + k*6 + l].getTriangles(); + std::list<Triangle> t = cubehole(i, j, k, l).getTriangles(); triangles.splice(triangles.end(), t); } } } } + return triangles; } |