Skip to content

Commit

Permalink
Working SDL input (keyboard/mouse)
Browse files Browse the repository at this point in the history 
Status: build and runs, keyboard+mouse working, window is somehow oversized but responsive.

Codechanges:
* creating render window via OgreBites::ApplicationContext instead of OGRE Root directly - needed to receive events
* overriding OgreBites::ApplicationContext::createRoot() with our pre-existing setup code, to initialize `mRoot` as expected.
* calling `OgreBites::ApplicationContext::addInputListener()` to receive events.
  • Loading branch information
@ohlidalp
ohlidalp committed Dec 11, 2022
1 parent a1c5a26 commit fc3d63d
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 22 deletions.
48 changes: 28 additions & 20 deletions source/main/AppContext.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,11 @@ bool AppContext::SetUpInput()
{
App::CreateInputEngine();

this->addInputListener(this);

if (App::io_ffb_enabled->getBool())
{
m_force_feedback.Setup();
// FIXME-SDL m_force_feedback.Setup();
}
return true;
}
Expand Down Expand Up @@ -239,12 +241,12 @@ void AppContext::SetRenderWindowIcon(Ogre::RenderWindow* rw)
#endif // _WIN32
}

bool AppContext::SetUpRendering()
void AppContext::createRoot()
{
// Create 'OGRE root' facade
std::string log_filepath = PathCombine(App::sys_logs_dir->getStr(), "RoR.log");
std::string cfg_filepath = PathCombine(App::sys_config_dir->getStr(), "ogre.cfg");
m_ogre_root = new Ogre::Root("", cfg_filepath, log_filepath);
mRoot = new Ogre::Root("", cfg_filepath, log_filepath);

// load OGRE plugins manually
std::string plugins_path = PathCombine(RoR::App::sys_process_dir->getStr(), "plugins.cfg");
Expand All @@ -255,45 +257,50 @@ bool AppContext::SetUpRendering()
cfg.load(plugins_path);
std::string plugin_dir = cfg.getSetting("PluginFolder", /*section=*/"", /*default=*/App::sys_process_dir->getStr());
Ogre::StringVector plugins = cfg.getMultiSetting("Plugin");
for (Ogre::String plugin_filename: plugins)
for (Ogre::String plugin_filename : plugins)
{
try
{
m_ogre_root->loadPlugin(PathCombine(plugin_dir, plugin_filename));
mRoot->loadPlugin(PathCombine(plugin_dir, plugin_filename));
}
catch (Ogre::Exception&) {} // Logged by OGRE
}
}
catch (Ogre::Exception& e)
{
ErrorUtils::ShowError (_L("Startup error"), e.getFullDescription());
return false;
ErrorUtils::ShowError(_L("Startup error"), e.getFullDescription());
return;
}

// Load renderer configuration
if (!m_ogre_root->restoreConfig())
if (!mRoot->restoreConfig())
{
const auto render_systems = App::GetAppContext()->GetOgreRoot()->getAvailableRenderers();
if (!render_systems.empty())
m_ogre_root->setRenderSystem(render_systems.front());
mRoot->setRenderSystem(render_systems.front());
else
ErrorUtils::ShowError (_L("Startup error"), _L("No render system plugin available. Check your plugins.cfg"));
ErrorUtils::ShowError(_L("Startup error"), _L("No render system plugin available. Check your plugins.cfg"));
}

const auto rs = m_ogre_root->getRenderSystemByName(App::app_rendersys_override->getStr());
if (rs != nullptr && rs != m_ogre_root->getRenderSystem())
const auto rs = mRoot->getRenderSystemByName(App::app_rendersys_override->getStr());
if (rs != nullptr && rs != mRoot->getRenderSystem())
{
// The user has selected a different render system during the previous session.
m_ogre_root->setRenderSystem(rs);
m_ogre_root->saveConfig();
mRoot->setRenderSystem(rs);
mRoot->saveConfig();
}
App::app_rendersys_override->setStr("");
}

bool AppContext::SetUpRendering()
{
this->createRoot();

// Start the renderer
m_ogre_root->initialise(/*createWindow=*/false);
mRoot->initialise(/*createWindow=*/false);

// Configure the render window
Ogre::ConfigOptionMap ropts = m_ogre_root->getRenderSystem()->getConfigOptions();
Ogre::ConfigOptionMap ropts = mRoot->getRenderSystem()->getConfigOptions();
Ogre::NameValuePairList miscParams;
miscParams["FSAA"] = ropts["FSAA"].currentValue;
miscParams["vsync"] = ropts["VSync"].currentValue;
Expand All @@ -319,10 +326,11 @@ bool AppContext::SetUpRendering()
if(height < 600) height = 600;

// Create render window
m_render_window = Ogre::Root::getSingleton().createRenderWindow (
// To use SDL input, we must create SDL window, otherwise we won't receive events.
OgreBites::NativeWindowPair window_pair = this->createWindow (
"Rigs of Rods version " + Ogre::String (ROR_VERSION_STRING),
width, height, ropts["Full Screen"].currentValue == "Yes", &miscParams);
OgreBites::WindowEventUtilities::_addRenderWindow(m_render_window);
width, height, miscParams);
m_render_window = window_pair.render;

this->SetRenderWindowIcon(m_render_window);
m_render_window->setActive(true);
Expand All @@ -337,7 +345,7 @@ bool AppContext::SetUpRendering()
Ogre::RenderWindow* AppContext::CreateCustomRenderWindow(std::string const& window_name, int width, int height)
{
Ogre::NameValuePairList misc;
Ogre::ConfigOptionMap ropts = m_ogre_root->getRenderSystem()->getConfigOptions();
Ogre::ConfigOptionMap ropts = mRoot->getRenderSystem()->getConfigOptions();
misc["FSAA"] = Ogre::StringConverter::parseInt(ropts["FSAA"].currentValue, 0);

Ogre::RenderWindow* rw = Ogre::Root::getSingleton().createRenderWindow(window_name, width, height, false, &misc);
Expand Down
8 changes: 6 additions & 2 deletions source/main/AppContext.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ class AppContext: public OgreBites::WindowEventListener,
public OgreBites::ApplicationContext
{
public:
AppContext(): OgreBites::ApplicationContext("Rigs of Rods") {}

// Startup (in order)
bool SetUpProgramPaths();
void SetUpLogging();
Expand All @@ -62,7 +64,7 @@ class AppContext: public OgreBites::WindowEventListener,
void ActivateFullscreen(bool val);

// Getters
Ogre::Root* GetOgreRoot() { return m_ogre_root; }
Ogre::Root* GetOgreRoot() { return mRoot; }
Ogre::Viewport* GetViewport() { return m_viewport; }
Ogre::RenderWindow* GetRenderWindow() { return m_render_window; }
RoR::ForceFeedback& GetForceFeedback() { return m_force_feedback; }
Expand All @@ -83,12 +85,14 @@ class AppContext: public OgreBites::WindowEventListener,
virtual bool buttonReleased(const OgreBites::ButtonEvent& arg) override;
virtual bool axisMoved(const OgreBites::AxisEvent& arg) override;

// OgreBites::ApplicationContext
virtual void createRoot() override;

// Rendering and window management
void SetRenderWindowIcon(Ogre::RenderWindow* rw);

// Variables

Ogre::Root* m_ogre_root = nullptr;
Ogre::RenderWindow* m_render_window = nullptr;
Ogre::Viewport* m_viewport = nullptr;
bool m_windowed_fix = false; //!< Workaround OGRE glitch when switching from fullscreen.
Expand Down

0 comments on commit fc3d63d

Please sign in to comment.