6502/EightBit
1
0
Fork 0
mirror of https://github.com/MoleskiCoder/EightBit.git synced 2024-12-23 00:29:47 +00:00
Code Issues Projects Releases Wiki Activity

Modifications to allow gaming class to be used with Space Invaders emulator

Browse Source 
Signed-off-by: Adrian Conlon <Adrian.conlon@gmail.com>
This commit is contained in:
Adrian Conlon 2019-09-29 00:27:45 +01:00
parent 4afe6b6378
commit 7a6e0eafcd
2 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
Gaming/inc/Game.h
View File

@ -37,12 +37,13 @@ namespace Gaming {
virtual int fps() const = 0; virtual int fps() const = 0;
virtual bool useVsync() const = 0; virtual bool useVsync() const = 0;
virtual int displayWidth() const { return rasterWidth(); } virtual int windowWidth() const noexcept { return displayWidth() * displayScale(); }
virtual int displayHeight() const { return rasterHeight(); } virtual int windowHeight() const noexcept { return displayHeight() * displayScale(); }
virtual int displayScale() const = 0; virtual int displayWidth() const noexcept { return rasterWidth(); }
virtual int displayHeight() const noexcept { return rasterHeight(); }
virtual int rasterWidth() const = 0; virtual int displayScale() const noexcept = 0;
virtual int rasterHeight() const = 0; virtual int rasterWidth() const noexcept = 0;
virtual int rasterHeight() const noexcept = 0;
virtual std::string title() const = 0; virtual std::string title() const = 0;
@ -57,12 +58,33 @@ namespace Gaming {
virtual const uint32_t* pixels() const = 0; virtual const uint32_t* pixels() const = 0;
std::shared_ptr<SDL_PixelFormat> m_pixelFormat; std::shared_ptr<GameController> gameController(const int which) const {
const auto i = m_gameControllers.find(which);
if (i == m_gameControllers.cend())
throw std::runtime_error("Unknown controller");
return i->second;
}
int mappedController(const SDL_JoystickID which) const {
const auto i = m_mappedControllers.find(which);
if (i == m_mappedControllers.cend())
throw std::runtime_error("Unknown joystick");
return i->second;
}
int chooseControllerIndex(int who) const;
std::shared_ptr<GameController> chooseController(int who) const;
std::shared_ptr<SDL_Renderer> renderer() const noexcept { return m_renderer; }
std::shared_ptr<SDL_Texture> bitmapTexture() const noexcept { return m_bitmapTexture; }
std::shared_ptr<SDL_PixelFormat> pixelFormat() const noexcept { return m_pixelFormat; }
private: private:
std::shared_ptr<SDL_Window> m_window; std::shared_ptr<SDL_Window> m_window;
std::shared_ptr<SDL_Renderer> m_renderer; std::shared_ptr<SDL_Renderer> m_renderer;
std::shared_ptr<SDL_Texture> m_bitmapTexture; std::shared_ptr<SDL_Texture> m_bitmapTexture;
std::shared_ptr<SDL_PixelFormat> m_pixelFormat;
Uint32 m_pixelType = SDL_PIXELFORMAT_ARGB8888; Uint32 m_pixelType = SDL_PIXELFORMAT_ARGB8888;
bool m_vsync = false; bool m_vsync = false;
@ -80,8 +102,5 @@ namespace Gaming {
virtual void handleJoyButtonDown(SDL_JoyButtonEvent event) {} virtual void handleJoyButtonDown(SDL_JoyButtonEvent event) {}
virtual void handleJoyButtonUp(SDL_JoyButtonEvent event) {} virtual void handleJoyButtonUp(SDL_JoyButtonEvent event) {}
int chooseControllerIndex(int who) const;
std::shared_ptr<GameController> chooseController(int who) const;
}; };
} }

2
Gaming/src/Game.cpp
View File

@ -18,7 +18,7 @@ void Game::raisePOWER() {
m_window.reset(::SDL_CreateWindow( m_window.reset(::SDL_CreateWindow(
title().c_str(), title().c_str(),
SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED,
displayWidth() * displayScale(), displayHeight() * displayScale(), windowWidth(), windowHeight(),
SDL_WINDOW_SHOWN), ::SDL_DestroyWindow); SDL_WINDOW_SHOWN), ::SDL_DestroyWindow);
if (m_window == nullptr) if (m_window == nullptr)
throwSDLException("Unable to create window: "); throwSDLException("Unable to create window: ");