Add rotation animation to cube

Author: Justiniscoding

floppysolver

@@ -11,13 +11,43 @@ FloppyCube InitFloppyCube(FloppyCube floppyCube){
     return floppyCube;
 }
 
-void DrawFloppyCube(FloppyCube floppyCube){
+float progress = 0;
+int fRotating = 0;
+int rRotating = 0;
+int lRotating = 0;
+int bRotating = 0;
+
+int animSpeed = 4;
+
+FloppyCube DrawFloppyCube(FloppyCube floppyCube){
+    if(fRotating || rRotating || lRotating || bRotating){
+        progress += animSpeed;
+    }
+    if(progress >= 180){
+        progress = 0;
+        if(fRotating){
+            floppyCube = ExecuteTurn(floppyCube, F);
+            fRotating = 0;
+        }
+        if(rRotating){
+            floppyCube = ExecuteTurn(floppyCube, R);
+            rRotating = 0;
+        }
+        if(lRotating){
+            floppyCube = ExecuteTurn(floppyCube, L);
+            lRotating = 0;
+        }
+        if(bRotating){
+            floppyCube = ExecuteTurn(floppyCube, B);
+            bRotating = 0;
+        }
+    }
     Vector2 planeSize = {1.9, 1.9};
 
     float planeOffset = 0.005;
 
     // Black centre area
-    DrawCube((Vector3){0.0,0.0,0.0}, 6.0, 2.0, 6.0, BLACK);
+    // DrawCube((Vector3){0.0,0.0,0.0}, 6.0, 2.0, 6.0, BLACK);
 
     // White and yellow stickers
     DrawPlane((Vector3){0.0,planeOffset+1.0,0.0}, planeSize, WHITE);
@@ -45,46 +75,122 @@ void DrawFloppyCube(FloppyCube floppyCube){
             index--;
         }
 
+        rlPushMatrix();
+        if(i > 3 && i != 5 && fRotating){
+            rlRotatef(progress, 0, 0, 1);
+        }
+        if(rRotating && (index == 2 || index == 4 || index == 7)){
+            rlRotatef(progress, 1, 0, 0);
+        }
+        if(lRotating && (index == 0 || index == 3 || index == 5)){
+            rlRotatef(progress, 1, 0, 0);
+        }
+        if(bRotating && index < 3){
+            rlRotatef(progress, 0, 0, 1);
+        }
         DrawPlane((Vector3){pos.x,planeOffset+1.0,pos.y}, planeSize, GetColorFromIndex(floppyCube.topFace[index]));
+        rlPopMatrix();
 
         rlPushMatrix();
         rlRotatef(180, 0, 0, -1);
         rlRotatef(180, 0, 1, 0);
+        if(i < 3 && fRotating){
+            rlRotatef(progress, 0, 0, -1);
+        }
+        if(bRotating && index > 4){
+            rlRotatef(progress, 0, 0, -1);
+        }
+        if(rRotating && (index == 2 || index == 4 || index == 7)){
+            rlRotatef(progress, 1, 0, 0);
+        }
+        if(lRotating && (index == 0 || index == 3 || index == 5)){
+            rlRotatef(progress, 1, 0, 0);
+        }
         DrawPlane((Vector3){pos.x,planeOffset+1.0,pos.y}, planeSize, GetColorFromIndex(floppyCube.bottomFace[index]));
         rlPopMatrix();
     }
 
     // Green stickers
     rlPushMatrix();
     rlRotatef(90, 1, 0, 0);
+    if(fRotating){
+        rlRotatef(progress, 0, 1, 0);
+    }
+    if(lRotating){
+        rlRotatef(progress, 1, 0, 0);
+    }
     DrawPlane((Vector3){-2,3+planeOffset,0}, planeSize, GetColorFromIndex(floppyCube.frontFace[0]));
+    if(lRotating){
+        rlRotatef(progress, -1, 0, 0);
+    }
     DrawPlane((Vector3){0,3+planeOffset,0}, planeSize, GetColorFromIndex(floppyCube.frontFace[1]));
+    if(rRotating){
+        rlRotatef(progress, 1, 0, 0);
+    }
     DrawPlane((Vector3){2,3+planeOffset,0}, planeSize, GetColorFromIndex(floppyCube.frontFace[2]));
     rlPopMatrix();
 
     // Red stickers
     rlPushMatrix();
     rlRotatef(-90, 0, 0, 1);
+    if(rRotating){
+        rlRotatef(progress, 0, 1, 0);
+    }
+    if(fRotating){
+        rlRotatef(progress, 0, 0, 1);
+    }
     DrawPlane((Vector3){0,3+planeOffset,2}, planeSize, GetColorFromIndex(floppyCube.rightFace[0]));
+    if(fRotating){
+        rlRotatef(progress, 0, 0, -1);
+    }
     DrawPlane((Vector3){0,3+planeOffset,0}, planeSize, GetColorFromIndex(floppyCube.rightFace[1]));
+    if(bRotating){
+        rlRotatef(progress, 0, 0, 1);
+    }
     DrawPlane((Vector3){0,3+planeOffset,-2}, planeSize, GetColorFromIndex(floppyCube.rightFace[2]));
     rlPopMatrix();
 
     // Orange stickers
     rlPushMatrix();
     rlRotatef(90, 0, 0, 1);
+    if(lRotating){
+        rlRotatef(progress, 0, -1, 0);
+    }
+    if(bRotating){
+        rlRotatef(progress, 0, 0, 1);
+    }
     DrawPlane((Vector3){0,3+planeOffset,-2}, planeSize, GetColorFromIndex(floppyCube.leftFace[0]));
+    if(bRotating){
+        rlRotatef(progress, 0, 0, -1);
+    }
     DrawPlane((Vector3){0,3+planeOffset,0}, planeSize, GetColorFromIndex(floppyCube.leftFace[1]));
+    if(fRotating){
+        rlRotatef(progress, 0, 0, 1);
+    }
     DrawPlane((Vector3){0,3+planeOffset,2}, planeSize, GetColorFromIndex(floppyCube.leftFace[2]));
     rlPopMatrix();
 
     // Blue stickers
     rlPushMatrix();
     rlRotatef(-90, 1, 0, 0);
+    if(bRotating){
+        rlRotatef(progress, 0, -1, 0);
+    }
+    if(rRotating){
+        rlRotatef(progress, 1, 0, 0);
+    }
     DrawPlane((Vector3){2,3+planeOffset,0}, planeSize, GetColorFromIndex(floppyCube.backFace[0]));
+    if(rRotating){
+        rlRotatef(progress, -1, 0, 0);
+    }
     DrawPlane((Vector3){0,3+planeOffset,0}, planeSize, GetColorFromIndex(floppyCube.backFace[1]));
+    if(lRotating){
+        rlRotatef(progress, 1, 0, 0);
+    }
     DrawPlane((Vector3){-2,3+planeOffset,0}, planeSize, GetColorFromIndex(floppyCube.backFace[2]));
     rlPopMatrix();
+
+    return floppyCube;
 }
 
 FloppyCube ExecuteTurn(FloppyCube cube, int turn){
@@ -120,6 +226,21 @@ FloppyCube ExecuteTurn(FloppyCube cube, int turn){
     return cube;
 }
 
+void DoTurn(FloppyCube cube, int turn){
+    if(turn == F){
+        fRotating = 1;
+    }
+    if(turn == B){
+        bRotating = 1;
+    }
+    if(turn == R){
+        rRotating = 1;
+    }
+    if(turn == L){
+        lRotating = 1;
+    }
+}
+
 FloppyCube RandomScramble(FloppyCube cube){
     int previous;
 

src/floppy.c

@@ -40,9 +40,10 @@ enum _Turns{
 
 typedef enum _Turns Turns;
 
-void DrawFloppyCube(FloppyCube floppyCube);
+void DoTurn(FloppyCube cube, int turn);
 
 FloppyCube RandomScramble(FloppyCube cube);
+FloppyCube DrawFloppyCube(FloppyCube floppyCube);
 FloppyCube InitFloppyCube(FloppyCube floppyCube);
 FloppyCube ExecuteTurn(FloppyCube cube, int turn);
 

src/floppy.h

@@ -13,7 +13,6 @@ void setup(){
     srand(time(NULL));
 
     floppy = InitFloppyCube(floppy);
-    floppy = ExecuteTurn(floppy, R);
 }
 
 int main(){
@@ -43,7 +42,7 @@ int main(){
         ClearBackground(LIGHTGRAY);
 
         BeginMode3D(camera);
-        DrawFloppyCube(floppy);
+        floppy = DrawFloppyCube(floppy);
         EndMode3D();
 
         DrawFPS(10,10);
@@ -76,16 +75,16 @@ int main(){
         }
 
         if(IsKeyReleased(KEY_F)){
-            floppy = ExecuteTurn(floppy, F);
+            /*floppy = */DoTurn(floppy, F);
         }
         if(IsKeyReleased(KEY_R)){
-            floppy = ExecuteTurn(floppy, R);
+            /*floppy = */DoTurn(floppy, R);
         }
         if(IsKeyReleased(KEY_L)){
-            floppy = ExecuteTurn(floppy, L);
+            /*floppy = */DoTurn(floppy, L);
         }
         if(IsKeyReleased(KEY_B)){
-            floppy = ExecuteTurn(floppy, B);
+            /*floppy =*/ DoTurn(floppy, B);
         }
         if(IsKeyReleased(KEY_S)){
             floppy = RandomScramble(floppy);