Diff: Cube/Cube.cpp

Revision:

5:54d3b36fec2c

Parent:

4:759a5c34e239

Child:

6:75031d14fc0d

--- a/Cube/Cube.cpp	Fri Feb 22 19:05:28 2019 +0000
+++ b/Cube/Cube.cpp	Fri Feb 22 19:15:50 2019 +0000
@@ -22,14 +22,6 @@
     float f3Points[4][3] = {{v[3][0], v[3][1], v[3][2]}, {v[2][0], v[2][1], v[2][2]}, {v[6][0], v[6][1], v[6][2]}, {v[7][0], v[7][1], v[7][2]}};
     float f4Points[4][3] = {{v[0][0], v[0][1], v[0][2]}, {v[3][0], v[3][1], v[3][2]}, {v[7][0], v[7][1], v[7][2]}, {v[4][0], v[4][1], v[4][2]}};
     float f5Points[4][3] = {{v[4][0], v[4][1], v[4][2]}, {v[5][0], v[5][1], v[5][2]}, {v[6][0], v[6][1], v[6][2]}, {v[7][0], v[7][1], v[7][2]}};
-    /*
-    float f0Points[4][3] = {{x-size, y+size, z-size}, {x-size, y+size, z+size}, {x+size, y+size, z+size}, {x+size, y+size, z-size}};
-    float f1Points[4][3] = {{x-size, y+size, z-size}, {x-size, y+size, z+size},{x-size, y-size, z+size}, {x-size, y-size, z-size}};
-    float f2Points[4][3] = {{x-size, y+size, z+size}, {x+size, y+size, z+size}, {x+size, y-size, z+size}, {x-size, y-size, z+size}};
-    float f3Points[4][3] = {{x+size, y+size, z-size}, {x+size, y+size, z+size}, {x+size, y-size, z+size}, {x+size, y-size, z-size}};
-    float f4Points[4][3] = {{x-size, y+size, z-size}, {x+size, y+size, z-size}, {x+size, y-size, z-size}, {x-size, y-size, z-size}};
-    float f5Points[4][3] = {{x-size, y-size, z-size}, {x-size, y-size, z+size}, {x+size, y-size, z+size}, {x+size, y-size, z-size}};
-    */
     faces[0].setVerticies(f0Points);
     faces[1].setVerticies(f1Points);
     faces[2].setVerticies(f2Points);
@@ -40,4 +32,24 @@
 
 Face Cube::getFace(int index){
     return faces[index];
+}
+
+void Cube::rotateX(float angle){
+    for( int i = 0; i<12; i++){
+        float hyp = sqrt(pow(verticies[i][0],2) + pow(verticies[i][1], 2));
+        verticies[i][0] += hyp*cos(angle);
+        verticies[i][1] += hyp*sin(angle);
+    }
+    float f0Points[4][3] = {{verticies[0][0], verticies[0][1], verticies[0][2]}, {verticies[1][0], verticies[1][1], verticies[1][2]}, {verticies[2][0], verticies[2][1], verticies[2][2]}, {verticies[3][0], verticies[3][1], verticies[3][2]}};
+    float f1Points[4][3] = {{verticies[0][0], verticies[0][1], verticies[0][2]}, {verticies[1][0], verticies[1][1], verticies[1][2]}, {verticies[5][0], verticies[5][1], verticies[5][2]}, {verticies[4][0], verticies[4][1], verticies[4][2]}};
+    float f2Points[4][3] = {{verticies[1][0], verticies[1][1], verticies[1][2]}, {verticies[2][0], verticies[2][1], verticies[2][2]}, {verticies[6][0], verticies[6][1], verticies[6][2]}, {verticies[5][0], verticies[5][1], verticies[5][2]}};
+    float f3Points[4][3] = {{verticies[3][0], verticies[3][1], verticies[3][2]}, {verticies[2][0], verticies[2][1], verticies[2][2]}, {verticies[6][0], verticies[6][1], verticies[6][2]}, {verticies[7][0], verticies[7][1], verticies[7][2]}};
+    float f4Points[4][3] = {{verticies[0][0], verticies[0][1], verticies[0][2]}, {verticies[3][0], verticies[3][1], verticies[3][2]}, {verticies[7][0], verticies[7][1], verticies[7][2]}, {verticies[4][0], verticies[4][1], verticies[4][2]}};
+    float f5Points[4][3] = {{verticies[4][0], verticies[4][1], verticies[4][2]}, {verticies[5][0], verticies[5][1], verticies[5][2]}, {verticies[6][0], verticies[6][1], verticies[6][2]}, {verticies[7][0], verticies[7][1], verticies[7][2]}};
+    faces[0].setVerticies(f0Points);
+    faces[1].setVerticies(f1Points);
+    faces[2].setVerticies(f2Points);
+    faces[3].setVerticies(f3Points);
+    faces[4].setVerticies(f4Points);
+    faces[5].setVerticies(f5Points);
 }
\ No newline at end of file