Diamond75/Panda3DS
1
0
Fork 0
mirror of https://github.com/wheremyfoodat/Panda3DS.git synced 2025-04-08 07:05:40 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Format the hydra

Browse source
This commit is contained in:
offtkp 2023-10-20 19:41:13 +03:00
parent d19a00d97d
commit 977ab53b68
2 changed files with 84 additions and 112 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/emulator.hpp
View file

@ -60,6 +60,7 @@ class Emulator {
#ifdef PANDA3DS_ENABLE_HTTP_SERVER #ifdef PANDA3DS_ENABLE_HTTP_SERVER
HttpServer httpServer; HttpServer httpServer;
friend struct HttpServer;
#endif #endif
#ifdef PANDA3DS_ENABLE_DISCORD_RPC #ifdef PANDA3DS_ENABLE_DISCORD_RPC

79
src/hydra_core.cpp
View file

@ -1,13 +1,13 @@
#include <hydra/core.hxx>
#include <emulator.hpp> #include <emulator.hpp>
#include <hydra/core.hxx>
#include <renderer_gl/renderer_gl.hpp> #include <renderer_gl/renderer_gl.hpp>
class HC_GLOBAL HydraCore final : public hydra::IBase, public hydra::IOpenGlRendered, public hydra::IFrontendDriven, public hydra::IInput class HC_GLOBAL HydraCore final : public hydra::IBase, public hydra::IOpenGlRendered, public hydra::IFrontendDriven, public hydra::IInput {
{
HYDRA_CLASS HYDRA_CLASS
public: public:
HydraCore(); HydraCore();
private:
private:
// IBase // IBase
bool loadFile(const char* type, const char* path) override; bool loadFile(const char* type, const char* path) override;
void reset() override; void reset() override;
@ -23,8 +23,8 @@ private:
void runFrame() override; void runFrame() override;
// IInput // IInput
void setPollInputCallback(void(*callback)()) override; void setPollInputCallback(void (*callback)()) override;
void setCheckButtonCallback(int32_t(*callback)(uint32_t player, hydra::ButtonType button)) override; void setCheckButtonCallback(int32_t (*callback)(uint32_t player, hydra::ButtonType button)) override;
std::unique_ptr<Emulator> emulator; std::unique_ptr<Emulator> emulator;
RendererGL* renderer; RendererGL* renderer;
@ -32,27 +32,22 @@ private:
int32_t (*checkButtonCallback)(uint32_t player, hydra::ButtonType button) = nullptr; int32_t (*checkButtonCallback)(uint32_t player, hydra::ButtonType button) = nullptr;
}; };
HydraCore::HydraCore() : emulator(new Emulator) HydraCore::HydraCore() : emulator(new Emulator) {
{ if (emulator->getRendererType() != RendererType::OpenGL) {
if (emulator->getRendererType() != RendererType::OpenGL)
{
throw std::runtime_error("HydraCore: Renderer is not OpenGL"); throw std::runtime_error("HydraCore: Renderer is not OpenGL");
} }
renderer = static_cast<RendererGL*>(emulator->getRenderer()); renderer = static_cast<RendererGL*>(emulator->getRenderer());
} }
bool HydraCore::loadFile(const char* type, const char* path) bool HydraCore::loadFile(const char* type, const char* path) {
{ if (std::string(type) == "rom") {
if (std::string(type) == "rom")
{
return emulator->loadROM(path); return emulator->loadROM(path);
} else { } else {
return false; return false;
} }
} }
void HydraCore::runFrame() void HydraCore::runFrame() {
{
renderer->resetStateManager(); renderer->resetStateManager();
pollInputCallback(); pollInputCallback();
@ -78,65 +73,41 @@ void HydraCore::runFrame()
emulator->runFrame(); emulator->runFrame();
} }
void HydraCore::reset() void HydraCore::reset() { emulator->reset(Emulator::ReloadOption::Reload); }
{
emulator->reset(Emulator::ReloadOption::Reload);
}
hydra::Size HydraCore::getNativeSize() hydra::Size HydraCore::getNativeSize() { return {400, 480}; }
{
return { 400, 480 };
}
// Size doesn't matter as the glBlitFramebuffer call is commented out for the core // Size doesn't matter as the glBlitFramebuffer call is commented out for the core
void HydraCore::setOutputSize(hydra::Size size) {} void HydraCore::setOutputSize(hydra::Size size) {}
void HydraCore::setGetProcAddress(void* function) void HydraCore::setGetProcAddress(void* function) {
{ #ifdef __ANDROID__
#ifdef __ANDROID__
if (!gladLoadGLES2Loader(reinterpret_cast<GLADloadproc>(function))) { if (!gladLoadGLES2Loader(reinterpret_cast<GLADloadproc>(function))) {
Helpers::panic("OpenGL ES init failed"); Helpers::panic("OpenGL ES init failed");
} }
#else #else
if (!gladLoadGLLoader(reinterpret_cast<GLADloadproc>(function))) { if (!gladLoadGLLoader(reinterpret_cast<GLADloadproc>(function))) {
Helpers::panic("OpenGL init failed"); Helpers::panic("OpenGL init failed");
} }
#endif #endif
// SDL_Window is not used, so we pass nullptr // SDL_Window is not used, so we pass nullptr
emulator->initGraphicsContext(nullptr); emulator->initGraphicsContext(nullptr);
} }
void HydraCore::setContext(void*) {} void HydraCore::setContext(void*) {}
void HydraCore::setFbo(unsigned handle) void HydraCore::setFbo(unsigned handle) { renderer->setFBO(handle); }
{
renderer->setFBO(handle);
}
void HydraCore::setPollInputCallback(void(*callback)()) void HydraCore::setPollInputCallback(void (*callback)()) { pollInputCallback = callback; }
{
pollInputCallback = callback;
}
void HydraCore::setCheckButtonCallback(int32_t(*callback)(uint32_t player, hydra::ButtonType button)) void HydraCore::setCheckButtonCallback(int32_t (*callback)(uint32_t player, hydra::ButtonType button)) { checkButtonCallback = callback; }
{
checkButtonCallback = callback;
}
HC_API hydra::IBase* createEmulator() HC_API hydra::IBase* createEmulator() { return new HydraCore; }
{
return new HydraCore;
}
HC_API void destroyEmulator(hydra::IBase* emulator) HC_API void destroyEmulator(hydra::IBase* emulator) { delete emulator; }
{
delete emulator;
}
HC_API const char* getInfo(hydra::InfoType type) HC_API const char* getInfo(hydra::InfoType type) {
{ switch (type) {
switch (type)
{
case hydra::InfoType::CoreName: return "Panda3DS"; case hydra::InfoType::CoreName: return "Panda3DS";
case hydra::InfoType::SystemName: return "Nintendo 3DS"; case hydra::InfoType::SystemName: return "Nintendo 3DS";
case hydra::InfoType::Description: return "HLE 3DS emulator. There's a little Alber in your computer and he runs Nintendo 3DS games."; case hydra::InfoType::Description: return "HLE 3DS emulator. There's a little Alber in your computer and he runs Nintendo 3DS games.";