diff options
| -rw-r--r-- | CMakeLists.txt | 7 | ||||
| -rw-r--r-- | Temparray.cpp | 5 | ||||
| -rw-r--r-- | Temparray.h | 24 |
3 files changed, 20 insertions, 16 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index de4bf01..7b8fd56 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,16 +7,13 @@ include_directories(${OPENGL_INCLUDE_DIR}) add_executable(c3d BSPTree.cpp BSPTree.h - Color.h Cubehole.cpp Cubehole.h Cuboid.cpp Cuboid.h DisplayClass.cpp DisplayClass.h gl.h main.cpp - Matrix.h - Triangle.h + Temparray.h Temparray.cpp Trapezocube.cpp Trapezocube.h - Vector.h - Vertex.h + Triangle.h ) target_link_libraries(c3d ${OPENGL_LIBRARIES}) diff --git a/Temparray.cpp b/Temparray.cpp new file mode 100644 index 0000000..06db986 --- /dev/null +++ b/Temparray.cpp @@ -0,0 +1,5 @@ +#include "Temparray.h" + +void Temparray::display(){ + +} diff --git a/Temparray.h b/Temparray.h index 629a4fe..72b5068 100644 --- a/Temparray.h +++ b/Temparray.h @@ -7,10 +7,11 @@ class Temparray { public: - Temparray(float initialtemp, int size[3]){ - teperature = new float[size[0]][size[1]][size[2]][4][6]; - cubearray = new Cubehole[size[0]][size[1]][size[2]]; - tempInit(initialtemp, size); + Temparray(float initialtemp, int size0[3]){ + float *temperature = new float[size0[0]][size0[1]][size0[2]][4][6]; + Cubehole *cubearray = new Cubehole[size0[0]][size0[1]][size0[2]]; + tempInit(initialtemp, size0); + size[0] = size0[0]; size[1] = size0[1];size[2] = size0[2]; } ~Temparray(){ delete[] temperature; @@ -18,7 +19,7 @@ class Temparray } void setTemp(float temp, int x, int y, int z, int direct, int pos){ - temperature[x][y][z][direct][pos]= temp; + temperature[x][y][z][direct][pos] = temp; } void deactivateCube(int x, int y, int z){ for(int i=0; i<4; i++){ @@ -30,13 +31,14 @@ class Temparray void display(); private: - float *temperature = 0; - Cubehole *cubearray = 0; + float *temperature; + Cubehole *cubearray; + int size[3]; - void tempInit(float temp0, int size[3]){ - for(int i=0; i<size[0]; i++){ - for(int j=0; j<size[1]; j++){ - for(int k=0; k<size[2]; k++){ + void tempInit(float temp0, int size0[3]){ + for(int i=0; i<size0[0]; i++){ + for(int j=0; j<size0[1]; j++){ + for(int k=0; k<size0[2]; k++){ for(int l=0; l<4; l++){ for(int m=0; m<6; m++){ setTemp(temp0, i, j, k, l, m); |