drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 6 Pull Requests Actions Releases 6 Activity

[nostalgia/player] Add PC controls and Bullock integration

Browse Source
This commit is contained in:
Gary Talent 2023-02-01 22:48:26 -06:00
parent 231f460668
commit cd28fee8fd
3 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/nostalgia/player/CMakeLists.txt
View File

@ -24,6 +24,7 @@ target_link_libraries(
nostalgia nostalgia
NostalgiaWorld NostalgiaWorld
NostalgiaCore NostalgiaCore
OxLogConn
) )
install( install(

33
src/nostalgia/player/app.cpp
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2016 - 2022 Gary Talent (gary@drinkingtea.net). All rights reserved. * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/ */
#include <nostalgia/core/core.hpp> #include <nostalgia/core/core.hpp>
@ -8,18 +8,24 @@ using namespace nostalgia;
static int spriteX = 72; static int spriteX = 72;
static int spriteY = 64; static int spriteY = 64;
static ox::StringView sprites = "nostalgia";
static bool paused = false;
static int updateHandler(core::Context *ctx) noexcept { static int updateHandler(core::Context *ctx) noexcept {
constexpr auto sleepTime = 16;
if (paused) {
return sleepTime;
}
int xmod = 0; int xmod = 0;
int ymod = 0; int ymod = 0;
if (core::buttonDown(ctx, core::Alpha_D) || core::buttonDown(ctx, core::GamePad_Right)) { if (buttonDown(ctx, core::Alpha_D) || buttonDown(ctx, core::GamePad_Right)) {
xmod = 2; xmod = 2;
} else if (core::buttonDown(ctx, core::Alpha_A) || core::buttonDown(ctx, core::GamePad_Left)) { } else if (buttonDown(ctx, core::Alpha_A) || buttonDown(ctx, core::GamePad_Left)) {
xmod = -2; xmod = -2;
} }
if (core::buttonDown(ctx, core::Alpha_S) || core::buttonDown(ctx, core::GamePad_Down)) { if (buttonDown(ctx, core::Alpha_S) || buttonDown(ctx, core::GamePad_Down)) {
ymod = 2; ymod = 2;
} else if (core::buttonDown(ctx, core::Alpha_W) || core::buttonDown(ctx, core::GamePad_Up)) { } else if (buttonDown(ctx, core::Alpha_W) || buttonDown(ctx, core::GamePad_Up)) {
ymod = -2; ymod = -2;
} }
if (!xmod && !ymod) { if (!xmod && !ymod) {
@ -27,17 +33,20 @@ static int updateHandler(core::Context *ctx) noexcept {
} }
spriteX += xmod; spriteX += xmod;
spriteY += ymod; spriteY += ymod;
constexpr ox::StringView s = "nostalgia"; for (unsigned i = 0; i < sprites.len(); ++i) {
for (unsigned i = 0; s[i]; ++i) { const auto c = static_cast<unsigned>(sprites[i] - ('a' - 1));
const auto c = static_cast<unsigned>(s[i] - ('a' - 1)); core::setSprite(ctx, i, spriteX + 8 * (static_cast<int>(i) + 1), spriteY, c, 0, 0, 0);
core::setSprite(ctx, i, spriteX + 8 * (static_cast<int>(i) + 1), spriteY, c);
} }
return 16; return sleepTime;
} }
static void keyEventHandler(core::Context *ctx, core::Key key, bool down) noexcept { static void keyEventHandler(core::Context *ctx, core::Key key, bool down) noexcept {
if (down && key == core::Key::Alpha_Q) { if (down) {
core::shutdown(ctx); if (key == core::Key::Alpha_Q) {
core::shutdown(ctx);
} else if (key == core::Key::Alpha_P) {
paused = !paused;
}
} }
} }

11
src/nostalgia/player/main.cpp
View File

@ -2,12 +2,23 @@
* Copyright 2016 - 2022 Gary Talent (gary@drinkingtea.net). All rights reserved. * Copyright 2016 - 2022 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/ */
#include <ox/logconn/logconn.hpp>
#include <nostalgia/core/core.hpp> #include <nostalgia/core/core.hpp>
#include "app.hpp" #include "app.hpp"
static ox::Error run(int argc, const char **argv) noexcept { static ox::Error run(int argc, const char **argv) noexcept {
ox::trace::init(); ox::trace::init();
#ifdef DEBUG
ox::LoggerConn loggerConn;
const auto loggerErr = loggerConn.initConn("Nostalgia Player");
if (loggerErr) {
oxErrf("Could not connect to logger: {} ({}:{})\n", toStr(loggerErr), loggerErr.file, loggerErr.line);
} else {
ox::trace::setLogger(&loggerConn);
}
#endif
if (argc < 2) { if (argc < 2) {
oxErr("Please provide path to project directory or OxFS file.\n"); oxErr("Please provide path to project directory or OxFS file.\n");
return OxError(1); return OxError(1);