breadone/Flappy3DS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

everythings laid out on the floor but oh its working

Browse Source
This commit is contained in:
pradyun 2023-09-15 09:36:35 +12:00
parent b1741a1320
commit bf849afea6
12 changed files with 173 additions and 321 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Flappy3DS.smdh Normal file
View File

Binary file not shown.

106
source/Bakery2D/Sprite/Sprite.cpp
View File

@ -1,106 +0,0 @@
#include "Sprite.hpp"
Sprite::Sprite() {
// C2D_SpriteSetCenter(&this->spr, 0.5f, 0.5f);
// C2D_SpriteSetPos(&this->spr, 400/2, 240/2);
this->x = 200; this->y = 120;
}
Sprite::Sprite(C2D_Sprite* spr, float x, float y) {
this->x = x; this->y = y; this->spr = *spr;
C2D_SpriteSetCenter(&this->spr, 0.5f, 0.5f);
C2D_SpriteSetPos(&this->spr, x, y);
}
void Sprite::setPosition(float x, float y) {
this->x = x;
this->y = y;
C2D_SpriteSetPos(&this->spr, x, y);
}
void Sprite::move(float dx, float dy, bool overrideOOB) {
if (!overrideOOB) {
// make sure translate doesnt move to OOB
const float newX = this->x + dx;
const float newY = this->y + dy;
if (!((unsigned)(newX-1) <= 398 && (unsigned)(newY-1) <= 238)) {
return;
}
}
this->x += dx;
this->y += dy;
C2D_SpriteSetPos(&this->spr, this->x, this->y);
}
void Sprite::setCenter(float x, float y) {
this->center[0] = x; this->center[1] = y;
C2D_SpriteSetCenter(&this->spr, x, y);
}
void Sprite::setHitbox(float w, float h) {
this->width = w; this->height = h;
}
bool Sprite::isCollidingWith(Sprite &other) {
// hitbox not set
if (this->width == 0 && this->height == 0) return false;
const float thisHalfWidth = this->width/2;
const float otherHalfWidth = other.width/2;
const float thisHalfHeight = this->height/2;
const float otherHalfHeight = other.height/2;
// check x collision
if (this->x + thisHalfWidth >= other.x - otherHalfWidth ||
this->x - thisHalfWidth <= other.x + otherHalfWidth
) {
return true;
}
// check y collision
if (this->y + thisHalfHeight >= other.y - otherHalfHeight ||
this->y - thisHalfHeight <= other.y + otherHalfHeight
) {
return true;
}
return false;
}
float* Sprite::getCenter() {
return this->center;
}
void Sprite::draw() {
C2D_DrawSprite(&this->spr);
}
float Sprite::getPosX() {
return this->x;
}
float Sprite::getPosY() {
return this->y;
}
C2D_Sprite* Sprite::getSpr() {
return &this->spr;
}
void Sprite::setSpr(C2D_Sprite* newSpr) {
this->spr = *newSpr;
}
void Sprite::copy(Sprite* other) {
memcpy(&other->x, &this->x, sizeof(this->x));
memcpy(&other->y, &this->y, sizeof(this->y));
memcpy(&other->width, &this->width, sizeof(this->width));
memcpy(&other->height, &this->height, sizeof(this->height));
memcpy(other->center, this->center, sizeof(this->center));
memcpy(&other->spr, &this->spr, sizeof(this->spr));
}

46
source/Bakery2D/Sprite/Sprite.hpp
View File

@ -1,46 +0,0 @@
#pragma once
#ifndef SPRITE_H
#define SPRITE_H
#include <citro2d.h>
class Sprite {
public:
Sprite();
Sprite(C2D_Sprite* spr, float x, float y);
void setPosition(float x, float y);
void move(float dx, float dy, bool overrideOOB=false);
void setCenter(float x, float y);
void setHitbox(float width, float height);
bool isCollidingWith(Sprite &other);
void draw();
float getPosX();
float getPosY();
float* getCenter();
C2D_Sprite* getSpr();
void setSpr(C2D_Sprite* newSpr);
void copy(Sprite* other);
C2D_Sprite spr;
private:
float x, y;
float width, height; // for hitbox
float center[2];
};
#endif

3
source/Bakery2D/Level/Level.cpp → source/Level.cpp
View File

@ -1,7 +1,6 @@
#include "Level.hpp"
template <typename T>
Level::Level(T* levelName, char* spritesheetPath, C3D_RenderTarget* top, C3D_RenderTarget* bottom) : level(levelName), top(top), bottom(bottom) {
Level::Level(Level* levelName, char* spritesheetPath, C3D_RenderTarget* top, C3D_RenderTarget* bottom) : level(levelName), top(top), bottom(bottom) {
this->spritesheet = C2D_SpriteSheetLoad(spritesheetPath);
size_t numImages = C2D_SpriteSheetCount(spritesheet);

10
source/Bakery2D/Level/Level.hpp → source/Level.hpp
View File

@ -8,8 +8,8 @@
#ifndef LEVEL_HPP
#define LEVEL_HPP
#include <citro2d.h>
#include "../Sprite/Sprite.hpp"
// #include <citro2d.h>
#include "Sprite.hpp"
#define SCREEN_WIDTH 400
#define SCREEN_HEIGHT 240
@ -64,12 +64,12 @@ public:
virtual void drawTop() = 0;
virtual void drawBottom() = 0;
template <typename T>
Level(T* levelName, char* spritesheetPath, C3D_RenderTarget* top, C3D_RenderTarget* bottom);
Level(Level* levelName, char* spritesheetPath, C3D_RenderTarget* top, C3D_RenderTarget* bottom);
// sets up the level if it hasnt been, then updates the logic, and draws the frame
void run();
virtual void cleanup();
virtual void cleanup() = 0;
};
#endif

109
source/MainLevel.cpp Normal file
View File

@ -0,0 +1,109 @@
#include "MainLevel.hpp"
MainLevel::MainLevel(C3D_RenderTarget* top, C3D_RenderTarget* bottom): Level(this, "romfs:/gfx/sprites.t3x", top, bottom) {}
void MainLevel::setup() {
//* SPRITE INIT *//
// set bird consts
sprites[SPR_BIRD].setPosition(SCREEN_WIDTH / 4, SCREEN_HEIGHT / 3);
sprites[SPR_BIRD].setHitbox(17, 12);
// set bottom screen scorecard
sprites[SPR_SCORECARD].setCenter(0.0, 0.0);
sprites[SPR_SCORECARD].setPosition(2, 40);
sprites[SPR_PIPETOP].setPosition(280, 3);
sprites[SPR_PIPEBOTTOM].setPosition(280, 280);
// set bg properties
sprites[SPR_BG].setPosition(200, 120);
C2D_SpriteSetScale(&sprites[SPR_BG].spr, 2.7778, 2.7907); // scale image to 400x240 (3ds screen res)
// if theres a better way to do this,,, i dont know it
for (int i = 0; i < NUM_PIPES; i++) {
memcpy(&pipes[i], &sprites[SPR_BOTHPIPES], sizeof(sprites[SPR_BOTHPIPES]));
pipes[i].setCenter(0.5f, 0.5f);
pipes[i].setPosition(SCREEN_WIDTH + 40 + i * (100), (rand() % 150) + 50);
pipes[i].setHitbox(26, 403);
}
//* FONT INIT *//
// Load fonts and text
g_staticBuf = C2D_TextBufNew(4096);
font = C2D_FontLoad("romfs:/gfx/fbfont.bcfnt");
C2D_TextFontParse(&scoreText, font, g_staticBuf, "0");
C2D_TextOptimize(&scoreText);
}
void MainLevel::update() {
hidScanInput();
// Respond to user input
u32 kDown = hidKeysDown();
if (kDown & KEY_START)
svcBreak(USERBREAK_USER); // break in order to return to hbmenu
// gravity calcs
v += a;
sprites[SPR_BIRD].move(0, v);
C2D_SpriteSetRotationDegrees(&sprites[SPR_BIRD].spr, v*9.8);
if (!gameOver && (kDown & KEY_A)) {
v = -5.5;
sprites[SPR_BIRD].move(0, v, true);
}
// bird hitting ground is game over
if (sprites[SPR_BIRD].getPosY() == SCREEN_HEIGHT) {
gameOver = true;
}
if (!gameOver) {
for (int i = 0; i < NUM_PIPES; i++) {
pipes[i].move(pipeSpeed, 0, true);
// collision detection
if (pipes[i].isCollidingWith(sprites[SPR_BIRD])) {
gameOver = true;
break;
}
// inc score
if (pipes[i].getPosX() == sprites[SPR_BIRD].getPosX())
score++;
// send pipes back to front of screen
if (pipes[i].getPosX() < -(SCREEN_WIDTH/NUM_PIPES)) {
pipes[i].setPosition(SCREEN_WIDTH, (rand() % 150) + 50);
}
}
}
// make score text
// char scoreString[(((sizeof score) * CHAR_BIT) + 2)/3 + 2];
// sprintf(scoreString, "%d", score);
// C2D_TextFontParse(&scoreText, font, g_staticBuf, scoreString);
// C2D_TextOptimize(&scoreText);
}
void MainLevel::drawTop() {
sprites[SPR_BG].draw();
sprites[SPR_BIRD].draw();
for (int i = 0; i < NUM_PIPES; i++) {
pipes[i].draw();
}
}
void MainLevel::drawBottom() {
sprites[SPR_SCORECARD].draw();
// C2D_DrawText(&scoreText, 0, 240, 88, 0.0f, 0.9f, 0.9f);
}
void MainLevel::cleanup() {
C2D_SpriteSheetFree(spritesheet);
C2D_TextBufDelete(g_staticBuf);
C2D_FontFree(font);
}

50
source/MainLevel.hpp Normal file
View File

@ -0,0 +1,50 @@
#pragma once
#ifndef MAINLEVEL_HPP
#define MAINLEVEL_HPP
#include "Level.hpp"
#define SPR_BIRD 0
#define SPR_BG 1
#define SPR_FLOOR 2
#define SPR_LOGO 3
#define SPR_PIPEBOTTOM 4
#define SPR_PIPETOP 5
#define SPR_SCORECARD 6
#define SPR_BOTHPIPES 7
#define NUM_PIPES 5
class MainLevel: public Level {
public:
float a = 0.4; // acceleration
float v = 0; // velocity
float pipeSpeed = -1;
Sprite pipes[NUM_PIPES];
int score = 0;
bool gameOver = false;
C2D_TextBuf g_staticBuf;
C2D_Text scoreText;
C2D_Font font;
MainLevel(C3D_RenderTarget* top, C3D_RenderTarget* bottom);
void setup();
void update();
void drawTop();
void drawBottom();
void cleanup();
};
#endif

7
source/Sprite.cpp
View File

@ -97,5 +97,10 @@ void Sprite::setSpr(C2D_Sprite* newSpr) {
}
void Sprite::copy(Sprite* other) {
memcpy(&other, this, sizeof(this));
memcpy(&other->x, &this->x, sizeof(this->x));
memcpy(&other->y, &this->y, sizeof(this->y));
memcpy(&other->width, &this->width, sizeof(this->width));
memcpy(&other->height, &this->height, sizeof(this->height));
memcpy(other->center, this->center, sizeof(this->center));
memcpy(&other->spr, &this->spr, sizeof(this->spr));
}

17
source/SpriteList.h
View File

@ -1,17 +0,0 @@
#pragma once
#ifndef SPRITES_H
#define SPRITES_H
#define SPR_BIRD 0
#define SPR_BG 1
#define SPR_FLOOR 2
#define SPR_LOGO 3
#define SPR_PIPEBOTTOM 4
#define SPR_PIPETOP 5
#define SPR_SCORECARD 6
#define SPR_BOTHPIPES 7
#endif

4
source/main.cpp
View File

@ -9,10 +9,8 @@
#include <stdlib.h>
#include <time.h>
#include <limits.h>
#include "Sprite.hpp"
#include "SpriteList.h"
#include "scenes/MainLevel.cpp"
#include "MainLevel.hpp"
int main(int argc, char* argv[]) {

140
source/scenes/MainLevel.cpp
View File

@ -1,140 +0,0 @@
#include "../Bakery2D/Level/Level.hpp"
#define SPRITES_H
#define SPR_BIRD 0
#define SPR_BG 1
#define SPR_FLOOR 2
#define SPR_LOGO 3
#define SPR_PIPEBOTTOM 4
#define SPR_PIPETOP 5
#define SPR_SCORECARD 6
#define SPR_BOTHPIPES 7
#define NUM_PIPES 5
struct MainLevel: Level {
float a = 0.4; // acceleration
float v = 0; // velocity
float pipeSpeed = -1;
Sprite pipes[NUM_PIPES];
int score = 0;
bool gameOver = false;
C2D_TextBuf g_staticBuf;
C2D_Text scoreText;
C2D_Font font;
MainLevel(C3D_RenderTarget* top, C3D_RenderTarget* bottom): Level(this, "romfs:/gfx/sprites.t3x", top, bottom) {}
void setup() {
//* SPRITE INIT *//
// set bird consts
sprites[SPR_BIRD].setPosition(SCREEN_WIDTH / 4, SCREEN_HEIGHT / 3);
sprites[SPR_BIRD].setHitbox(17, 12);
// set bottom screen scorecard
sprites[SPR_SCORECARD].setCenter(0.0, 0.0);
sprites[SPR_SCORECARD].setPosition(2, 40);
sprites[SPR_PIPETOP].setPosition(280, 3);
sprites[SPR_PIPEBOTTOM].setPosition(280, 280);
// set bg properties
sprites[SPR_BG].setPosition(200, 120);
C2D_SpriteSetScale(&sprites[SPR_BG].spr, 2.7778, 2.7907); // scale image to 400x240 (3ds screen res)
// if theres a better way to do this,,, i dont know it
for (int i = 0; i < NUM_PIPES; i++) {
memcpy(&pipes[i], &sprites[SPR_BOTHPIPES], sizeof(sprites[SPR_BOTHPIPES]));
pipes[i].setCenter(0.5f, 0.5f);
pipes[i].setPosition(SCREEN_WIDTH + 40 + i * (100), (rand() % 150) + 50);
pipes[i].setHitbox(26, 403);
}
//* FONT INIT *//
// Load fonts and text
g_staticBuf = C2D_TextBufNew(4096);
font = C2D_FontLoad("romfs:/gfx/fbfont.bcfnt");
C2D_TextFontParse(&scoreText, font, g_staticBuf, "0");
C2D_TextOptimize(&scoreText);
}
void update() {
hidScanInput();
// Respond to user input
u32 kDown = hidKeysDown();
if (kDown & KEY_START)
svcBreak(USERBREAK_USER); // break in order to return to hbmenu
// gravity calcs
v += a;
sprites[SPR_BIRD].move(0, v);
C2D_SpriteSetRotationDegrees(&sprites[SPR_BIRD].spr, v*9.8);
if (!gameOver && (kDown & KEY_A)) {
v = -5.5;
sprites[SPR_BIRD].move(0, v, true);
}
// bird hitting ground is game over
if (sprites[SPR_BIRD].getPosY() == SCREEN_HEIGHT) {
gameOver = true;
}
if (!gameOver) {
for (int i = 0; i < NUM_PIPES; i++) {
pipes[i].move(pipeSpeed, 0, true);
// collision detection
if (pipes[i].isCollidingWith(sprites[SPR_BIRD])) {
gameOver = true;
break;
}
// inc score
if (pipes[i].getPosX() == sprites[SPR_BIRD].getPosX())
score++;
// send pipes back to front of screen
if (pipes[i].getPosX() < -(SCREEN_WIDTH/NUM_PIPES)) {
pipes[i].setPosition(SCREEN_WIDTH, (rand() % 150) + 50);
}
}
}
// make score text
char scoreString[(((sizeof score) * CHAR_BIT) + 2)/3 + 2];
sprintf(scoreString, "%d", score);
C2D_TextFontParse(&scoreText, font, g_staticBuf, scoreString);
C2D_TextOptimize(&scoreText);
}
void drawTop() {
sprites[SPR_BG].draw();
sprites[SPR_BIRD].draw();
for (int i = 0; i < NUM_PIPES; i++) {
pipes[i].draw();
}
}
void drawBottom() {
sprites[SPR_SCORECARD].draw();
C2D_DrawText(&scoreText, 0, 240, 88, 0.0f, 0.9f, 0.9f);
}
void cleanup() override {
C2D_SpriteSheetFree(spritesheet);
C2D_TextBufDelete(g_staticBuf);
C2D_FontFree(font);
}
};

2
upload.sh
View File

@ -1,2 +1,2 @@
# need to have ftpd open for this
curl -T Flappy3DS.3dsx ftp://192.168.88.131:5000/3ds/
curl -T B2DFlappy3DS.3dsx ftp://192.168.88.131:5000/3ds/