Merge pull request #322 from hydra-emu/wrage-6
Implement getFps hc function
This commit is contained in:
@@ -117,4 +117,5 @@ class Emulator {
|
|||||||
ServiceManager& getServiceManager() { return kernel.getServiceManager(); }
|
ServiceManager& getServiceManager() { return kernel.getServiceManager(); }
|
||||||
RendererType getRendererType() const { return config.rendererType; }
|
RendererType getRendererType() const { return config.rendererType; }
|
||||||
Renderer* getRenderer() { return gpu.getRenderer(); }
|
Renderer* getRenderer() { return gpu.getRenderer(); }
|
||||||
|
u64 getTicks() { return cpu.getTicks(); }
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ class HC_GLOBAL HydraCore final : public hydra::IBase, public hydra::IOpenGlRend
|
|||||||
|
|
||||||
// IFrontendDriven
|
// IFrontendDriven
|
||||||
void runFrame() override;
|
void runFrame() override;
|
||||||
|
uint16_t getFps() override;
|
||||||
|
|
||||||
// IInput
|
// IInput
|
||||||
void setPollInputCallback(void (*callback)()) override;
|
void setPollInputCallback(void (*callback)()) override;
|
||||||
@@ -71,10 +72,13 @@ void HydraCore::runFrame() {
|
|||||||
int y = !!checkButtonCallback(0, hydra::ButtonType::Analog1Up) - !!checkButtonCallback(0, hydra::ButtonType::Analog1Down);
|
int y = !!checkButtonCallback(0, hydra::ButtonType::Analog1Up) - !!checkButtonCallback(0, hydra::ButtonType::Analog1Down);
|
||||||
hid.setCirclepadX(x * 0x9C);
|
hid.setCirclepadX(x * 0x9C);
|
||||||
hid.setCirclepadY(y * 0x9C);
|
hid.setCirclepadY(y * 0x9C);
|
||||||
|
hid.updateInputs(emulator->getTicks());
|
||||||
|
|
||||||
emulator->runFrame();
|
emulator->runFrame();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
uint16_t HydraCore::getFps() { return 60; }
|
||||||
|
|
||||||
void HydraCore::reset() { emulator->reset(Emulator::ReloadOption::Reload); }
|
void HydraCore::reset() { emulator->reset(Emulator::ReloadOption::Reload); }
|
||||||
hydra::Size HydraCore::getNativeSize() { return {400, 480}; }
|
hydra::Size HydraCore::getNativeSize() { return {400, 480}; }
|
||||||
|
|
||||||
|
|||||||
2
third_party/hydra_core
vendored
2
third_party/hydra_core
vendored
Submodule third_party/hydra_core updated: 090c8a74e0...51a2dceb31
Reference in New Issue
Block a user