ELEC2645 (2018/19) / Mbed 2 deprecated el17cd

Dependencies:   mbed

Revision:
36:6fbafc8bed80
Parent:
35:fe3956825bd8
Child:
37:524b91130885
--- a/Cube/Cube.h	Mon Apr 29 14:53:36 2019 +0000
+++ b/Cube/Cube.h	Mon Apr 29 14:58:59 2019 +0000
@@ -14,14 +14,10 @@
     float verticies[8][3];
     Face faces[6];
     float xPos, yPos, zPos;
-    void updateFacesVerticies(float (&vert)[8][3]);
     /** sets the verticies of all the cubes faces depending on the location and size of the cube
     *@param The memory address of the two dimentional float array which stores all x, y, z coordinates for each 8 verticies
     */
-    void assignFacesVerticies(float (&face0Points)[4][3],
-    float (&face1Points)[4][3], float (&face2Points)[4][3],
-    float (&face3Points)[4][3], float (&face4Points)[4][3],
-    float (&face5Points)[4][3]);
+    void updateFacesVerticies(float (&vert)[8][3]);
     /** sets the verticies of an individual face of the cube
     *@param The memory address of the two dimentional float array which stores all x, y, z coordinates for the first face verticies
     *@param The memory address of the two dimentional float array which stores all x, y, z coordinates for the second face verticies
@@ -30,46 +26,51 @@
     *@param The memory address of the two dimentional float array which stores all x, y, z coordinates for the fifth face verticies
     *@param The memory address of the two dimentional float array which stores all x, y, z coordinates for the sixth faces verticies
     */
+    void assignFacesVerticies(float (&face0Points)[4][3],
+    float (&face1Points)[4][3], float (&face2Points)[4][3],
+    float (&face3Points)[4][3], float (&face4Points)[4][3],
+    float (&face5Points)[4][3]);
+
   public:
-    Cube();
     /** The constructor of the Cube class which instantiates the cube object.
     *No parameters are required as the cube is initially created with a size of 5 and a position at the origin.
     */
-    Face getFace(int index);
+    Cube();
     /** An accessor method which gets a face of the cube depending on the index provided
     *@param The integer index of the face required
     *@returns A face object corresponding to the index provided
     */
-    void setVisible();
+    Face getFace(int index);
     /** Sets the faces of the cube to be visible so that they will be rendered
     */
-    bool tooClose();
+    void setVisible();
     /** Returns whether the cube is too close to the perspective of the user
     *@returns a boolean indicating whether it is too close or not
     */
+    bool tooClose();
+    /** Performs a rotation in the X axis about the cubes centre
+    *@param The angle in which to rotate the cube in terms of radians, provided as a float
+    */
     void rotateX(float angle);
-    /** Performs a rotation in the X axis about the cubes centre
+    /** Performs a rotation in the Y axis about the cubes centre
     *@param The angle in which to rotate the cube in terms of radians, provided as a float
     */
     void rotateY(float angle);
-    /** Performs a rotation in the Y axis about the cubes centre
+    /** Performs a rotation in the Z axis about the cubes centre
     *@param The angle in which to rotate the cube in terms of radians, provided as a float
     */
     void rotateZ(float angle);
-    /** Performs a rotation in the Z axis about the cubes centre
-    *@param The angle in which to rotate the cube in terms of radians, provided as a float
-    */
-    void translate(float x, float y, float z);
     /** Performs a translation in all axis
     *@param The x offset
     *@param The y offset
     *@param The z offset
     */
-    void resetPos();
+    void translate(float x, float y, float z);
     /** Resets the position of the cube to the origin
     */
-    bool despawn();
+    void resetPos();
     /** Returns whether the cube is behind the users perspective
     *@returns a boolean value as to whether it should be despawned or not
     */
+    bool despawn();
 };
\ No newline at end of file