add working menu, broken physics

Signed-off-by: Lauren Kelly <[email protected]>

Author: thejsa

Makefile

@@ -41,6 +41,9 @@ GRAPHICS	:=	gfx
 ROMFS		:=	romfs
 GFXBUILD	:=	$(ROMFS)/gfx
 
+APP_TITLE	:=	Rhythm Run
+APP_AUTHOR	:=	Lauren Kelly
+
 #---------------------------------------------------------------------------------
 # options for code generation
 #---------------------------------------------------------------------------------

blobs_src/platform.png

@@ -1,4 +1,5 @@
 --atlas -f rgba8888 -z auto
 lennycat.png
 test_cat.png
-star.png
+star.png
+platform.png

gfx/platform.png

@@ -18,9 +18,15 @@
 class Button : public Entity
 {
 public:
-    Button(float a_x, float a_y, C2D_SpriteSheet a_spriteSheet, size_t a_spriteIndex,
-    	float a_centerX, float a_centerY, float a_scaleX, float a_scaleY,
-    	float a_rotation);
+    Button(float a_x, float a_y, C2D_SpriteSheet a_spriteSheet,
+        size_t a_spriteIndex, size_t a_spriteIndex_pressed,
+    	float a_centerX, float a_centerY,
+        float a_scaleX, float a_scaleY,
+    	float a_rotation)
+    : Entity(a_x, a_y, a_spriteSheet, a_spriteIndex, a_centerX, a_centerY,
+        a_scaleX, a_scaleY, a_rotation),
+        isPressed(false),
+        spriteIndex_pressed(a_spriteIndex_pressed) {};
     Button() {}; // default empty constructor
 
     /// @brief Add event listener
@@ -29,7 +35,25 @@ class Button : public Entity
     void addEventListener(const touchEventKind_t a_eventType, const callback_t<touchEvent_t> &a_listener) {
         callbacks.push_back({a_listener, a_eventType});
     };
-private:
+
+    /// @brief Set the sprite graphic to be displayed
+    /// @param a_index Index of the sprite to use (normal)
+    /// @param a_spriteSheet Sprite sheet to use (defaults to the current)
+    void setSprite(size_t a_index, C2D_SpriteSheet a_spriteSheet);
+
+    /// @brief Set the sprite graphic to be displayed
+    /// @param a_index Index of the sprite to use (normal)
+    /// @param a_index_pressed Index of the sprite to use (pressed state)
+    /// @param a_spriteSheet Sprite sheet to use (defaults to the current)
+    void setSprite(size_t a_index, size_t a_index_pressed, C2D_SpriteSheet a_spriteSheet);
+
+    inline bool getPressed() { return isPressed; }
+    void setPressed(bool a_newState);
+protected:
+    /// @brief Whether or not the button is in its pressed/held state.
+    bool isPressed;
+    /// @brief Index of sprite graphic currently being used from sheet
+    size_t spriteIndex_pressed;
     /// @brief Registered callbacks
     std::vector<touchEventListener_t> callbacks;
 };

gfx/sprites.t3s

@@ -81,7 +81,7 @@ class Entity : public Drawable
 
     /// @brief Draw the sprite
     inline bool draw() { return C2D_DrawSprite(&sprite); };
-private:
+protected:
     /// @brief Current C2D sprite sheet
     C2D_SpriteSheet spriteSheet;
     /// @brief Index of sprite graphic currently being used from sheet

include/Button.hpp

@@ -17,14 +17,14 @@ typedef enum touchEventKind_t {
     TOUCH_MOVE  = 2,
 } touchEventKind_t;
 
-/// Touch event listener
-typedef struct touchEventListener_t {
-    callback_t<touchEvent_t> cb;
-    touchEventKind_t kind;
-} touchEventListener_t;
-
 /// Touch event
 typedef struct touchEvent_t {
     touchEventKind_t kind;
     Point pos;
-} touchEvent_t;
+} touchEvent_t;
+
+/// Touch event listener
+typedef struct touchEventListener_t {
+    callback_t<touchEvent_t> cb;
+    touchEventKind_t kind;
+} touchEventListener_t;

include/Entity.hpp

@@ -35,14 +35,17 @@ class Game
     /// Draw frame for lower screen
     void drawLower();
     /// Render a full dual-screen frame
-    void draw() {
-        drawUpper();
-        // drawLower();
-    };
+    void draw();
+
+    /// should we quit the program?
+    /// ask scene manager.
+    inline bool shouldQuit() {
+        return sceneManager.shouldQuit();
+    }
 
-    bool isRunning() {  // Should the game continue running?
+    inline bool isRunning() {  // Should the game continue running?
         // Quit if APT says we should, or if we've set the quit flag
-        return aptMainLoop() && !quitFlag;
+        return aptMainLoop() && !shouldQuit();
     };
 private:
     RenderWindow upperScreen;
@@ -53,6 +56,4 @@ class Game
 
     u64 lastTime;
     float timeDelta;
-
-    bool quitFlag;
 };

include/Events.hpp

@@ -23,17 +23,29 @@ class Rectangle {
         : topLeft(a_topLeft), lowerRight(a_lowerRight) { };
 
     /// Returns true if this Rectangle intersects the given Rectangle.
-    inline bool doesIntersect(Rectangle a_rect) {
-        // Two rectangles DO NOT overlap if and only if:
-        // * One rectangle is above the top edge of the other; AND/OR
-        // * One rectangle is further left than the left edge of the other.
-        // Therefore, this checks that neither of the above conditions are met.
+    // inline bool doesIntersect(Rectangle a_rect) {
+    //     // Two rectangles DO NOT overlap if and only if:
+    //     // * One rectangle is above the top edge of the other; AND/OR
+    //     // * One rectangle is further left than the left edge of the other.
+    //     // Therefore, this checks that neither of the above conditions are met.
 
-        return !(
-            (topLeft.x >= a_rect.lowerRight.x) ||
-            (a_rect.topLeft.x >= lowerRight.x) ||
-            (topLeft.y <= a_rect.lowerRight.y) ||
-            (a_rect.topLeft.y <= lowerRight.y)
+    //     return !(
+    //         (topLeft.x >= a_rect.lowerRight.x) ||
+    //         (a_rect.topLeft.x >= lowerRight.x) ||
+    //         (topLeft.y <= a_rect.lowerRight.y) ||
+    //         (a_rect.topLeft.y <= lowerRight.y)
+    //     );
+    // }
+    inline bool doesIntersect(Rectangle a_rect) {
+        return (
+            (
+                a_rect.topLeft.x >= topLeft.x &&
+                a_rect.lowerRight.x <= lowerRight.x
+            ) &&
+            (
+                a_rect.topLeft.y >= topLeft.y &&
+                a_rect.lowerRight.y <= lowerRight.y
+            )
         );
     }
 

include/Game.hpp

@@ -20,7 +20,7 @@
 class Label : public Drawable
 {
 public:
-    Label(const char *a_text, float a_x, float a_y, u32 a_flags, float a_scaleX, float a_scaleY, size_t a_bufSize);
+    Label(const char *a_text, float a_x, float a_y, u32 a_flags, float a_scaleX, float a_scaleY, u32 a_color, size_t a_bufSize);
     Label() {}; // default empty constructor
 
     // Destructor -- clean up text buf
@@ -62,15 +62,19 @@ class Label : public Drawable
         scaleY *= a_scaleY;
     };
 
-    bool draw() {
-        C2D_DrawText(&text, textFlags, posX, posY, 0.0f, scaleX, scaleY);
-        return true;
-    };
+    /// Set label text
+    void setText(const char *a_text, size_t a_bufSize);
+    /// Set label color
+    void setColor(u32 a_color) { color = a_color; };
+
+    bool draw();
 private:
     C2D_Text text;
     C2D_TextBuf textBuf;
     u32 textFlags;
 
     float posX, posY;
     float scaleX, scaleY;
+    
+    u32 color;
 };

include/Geometry.hpp

@@ -0,0 +1,98 @@
+/*
+ * Rhythm Run for Nintendo 3DS
+ * Lauren Kelly, 2021
+ */
+
+#pragma once
+#include <3ds.h>
+#include <citro2d.h>
+#include <stdint.h>
+#include <memory>
+
+#include "Button.hpp"
+#include "Label.hpp"
+
+/**
+ * LabelledButton class
+ */
+
+class LabelledButton : public Button
+{
+public:
+    LabelledButton(float a_x, float a_y, C2D_SpriteSheet a_spriteSheet,
+        size_t a_spriteIndex, size_t a_spriteIndex_pressed,
+    	float a_centerX, float a_centerY,
+        const char *a_text,
+        float a_scaleX, float a_scaleY,
+    	float a_rotation,
+        u32 a_textColor);
+    LabelledButton() {}; // default empty constructor
+
+    /// Set the state (pressed/not pressed)
+    // inline void setPressed(bool a_newState) {
+    //     if(isPressed == a_newState) return;
+
+    //     Button::setPressed(a_newState);
+    //     if(a_newState == true) {
+    //         textLabel->move(2.0f, 2.0f);
+    //     } else {
+    //         textLabel->move(-2.0f, -2.0f);
+    //     }
+    // };
+
+    /// Draw the LabelledButton
+    inline bool draw() {
+        Button::draw();
+
+        Point newPosition = calculatePosition();
+
+        // eeprintf("textLabel->setPosition %.02f, %.02f\n",
+        //     floor(newPosition.x),
+        //     floor(newPosition.y)
+        // );
+        textLabel->setPosition(
+            floor(newPosition.x),
+            floor(newPosition.y)
+        );
+
+        textLabel->draw();
+        return true;
+    };
+
+    /// @brief Move the button (relative)
+    /// @param a_dX,a_dY Tranlation in each dimension
+    inline void move(float a_dX, float a_dY) {
+        Button::move(a_dX, a_dY);
+        textLabel->move(a_dX, a_dY);
+    };
+    /// @brief Scale the button by some scale factor relative to its current size
+    /// @param a_scaleX, a_scaleY Scale factor in each dimension
+    inline void scale(float a_scaleX, float a_scaleY) {
+        Button::scale(a_scaleX, a_scaleY);
+        textLabel->scale(a_scaleX, a_scaleY);
+    }
+
+    /// Set label text
+    // inline void setText(const char *a_text, size_t a_bufSize = 0) { textLabel->setText(a_text, a_bufSize); };
+    /// Set label color
+    // inline void setColor(u32 a_color = 0) { textLabel->setColor(a_color); };
+    /// @brief The button label
+    std::shared_ptr<Label> textLabel;
+protected:
+    Point calculatePosition() {
+        Point topLeft = getRect().topLeft;
+        
+        float fontScale = 0.75f * getHeight() / 30.0f; // 3ds font height = 30px
+        // float fontScale = 0.75f;
+        // eeprintf("Font scale: %.02f\n", fontScale);
+
+        float fontBaseline = 25.0f * fontScale;
+        // float fontBaseline = 24.0f;
+        // eeprintf("Font base : %.02f\n", fontBaseline);
+
+        return Point{
+            topLeft.x + (getWidth() / 2),
+            topLeft.y + fontBaseline
+        };
+    }
+};

include/Label.hpp

@@ -33,7 +33,7 @@ class RenderWindow
 		C3D_FrameBegin(C3D_FRAME_SYNCDRAW);
         C2D_SceneBegin(renderTarget);
 
-        clear(C2D_Color32(0xFF, 0x44, 0x77, 0xFF));
+        // clear(C2D_Color32(0xFF, 0x44, 0x77, 0xFF));
     };
 
     /// Draw something
@@ -45,6 +45,19 @@ class RenderWindow
     void endDraw() {
         // eprintf("EndDraw\n");
         C3D_FrameEnd(0);
+
+        // sync to 60fps
+        float gpuTime = C3D_GetDrawingTime();
+        float cpuTime = C3D_GetProcessingTime();
+        // gfxFlushBuffers();
+        if (gpuTime > 1000.0f / 30.f || cpuTime > 1000.0f / 30.0f) {
+            printf("!! TOO SLOW !!\n");
+        } else {
+            gspWaitForVBlank();
+        }
+        printf("\x1b[29;1HGPU: %.02f ms; CPU: %.02f ms  ", gpuTime, cpuTime);
+        // eprintf("")
+        // gfxSwapBuffers();
     };
 
     /// Clear the window with a particular colour

include/LabelledButton.hpp

@@ -27,6 +27,9 @@ class Scene
     /// Called whenever the scene loses focus ('blur')
     virtual void onBlur() {};
 
+    /// Whether it is safe to terminate the scene now
+    virtual bool canQuit() { return true; };
+
     // To be overridden as necessary
     virtual void processInput() {};
     virtual void update(float a_timeDelta) {};

include/RenderWindow.hpp

@@ -51,11 +51,17 @@ class SceneGameplay : public Scene
 
 	C2D_SpriteSheet spriteSheet;
 
-	std::shared_ptr<Entity> splashImageEntity;
+	std::shared_ptr<Entity> playerEntity;
+
+	std::shared_ptr<Entity> platform1Entity;
+	std::shared_ptr<Entity> platform2Entity;
+	std::shared_ptr<Entity> platform3Entity;
+	std::shared_ptr<Entity> platform4Entity;
+
     std::shared_ptr<OggOpusFile> opusFile;
     unsigned int audioId;
-
     bool isJumping;
+    bool shouldRedraw;
     float velocityX, velocityY;
     float accelX, accelY;
 };