diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt index d96d7b99e..2c3f59b4f 100644 --- a/apps/openmw/CMakeLists.txt +++ b/apps/openmw/CMakeLists.txt @@ -169,8 +169,6 @@ if(BUILD_VR_OPENXR) target_compile_options(openmw_vr PUBLIC -DUSE_OPENXR -DXR_USE_GRAPHICS_API_OPENGL -DXR_USE_PLATFORM_WIN32) endif() - - # Sound stuff - here so CMake doesn't stupidly recompile EVERYTHING # when we change the backend. include_directories( diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp index c6f26dd0a..d158a73f9 100644 --- a/apps/openmw/engine.cpp +++ b/apps/openmw/engine.cpp @@ -544,6 +544,7 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings) gameControllerdb = globaldefault; else gameControllerdb = ""; //if it doesn't exist, pass in an empty string + std::string myguiResources = (mResDir / "mygui").string(); osg::ref_ptr guiRoot = new osg::Group; guiRoot->setName("GUI Root"); @@ -787,7 +788,6 @@ void OMW::Engine::go() } else { - mViewer->eventTraversal(); mViewer->updateTraversal(); diff --git a/apps/openmw/engine.hpp b/apps/openmw/engine.hpp index 972684a48..5a94fe840 100644 --- a/apps/openmw/engine.hpp +++ b/apps/openmw/engine.hpp @@ -67,7 +67,6 @@ namespace osgViewer class ScreenCaptureHandler; } - struct SDL_Window; namespace OMW diff --git a/apps/openmw/mwinput/inputmanagerimp.hpp b/apps/openmw/mwinput/inputmanagerimp.hpp index a45c7486c..086b0eb73 100644 --- a/apps/openmw/mwinput/inputmanagerimp.hpp +++ b/apps/openmw/mwinput/inputmanagerimp.hpp @@ -99,7 +99,6 @@ namespace MWInput virtual bool controlsDisabled() { return mControlsDisabled; } - protected: void convertMousePosForMyGUI(int& x, int& y); diff --git a/apps/openmw/mwinput/mousemanager.cpp b/apps/openmw/mwinput/mousemanager.cpp index 3c18e48d4..1f01b6c90 100644 --- a/apps/openmw/mwinput/mousemanager.cpp +++ b/apps/openmw/mwinput/mousemanager.cpp @@ -249,6 +249,7 @@ namespace MWInput { mInputWrapper->warpMouse(static_cast(mGuiCursorX / mInvUiScalingFactor), static_cast(mGuiCursorY / mInvUiScalingFactor)); } + void MouseManager::setMousePosition(int x, int y) { mGuiCursorX = x * mInvUiScalingFactor; diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp index ddad011c9..1456d1a5d 100644 --- a/apps/openmw/mwmechanics/character.cpp +++ b/apps/openmw/mwmechanics/character.cpp @@ -1679,7 +1679,6 @@ bool CharacterController::updateWeaponState(CharacterState& idle) animPlaying = mAnimation->getInfo(mCurrentWeapon, &complete); if(mUpperBodyState == UpperCharState_MinAttackToMaxAttack && !isKnockedDown()) mAttackStrength = complete; - } else { diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp index 31d4ae389..0142bdb51 100644 --- a/apps/openmw/mwrender/animation.cpp +++ b/apps/openmw/mwrender/animation.cpp @@ -897,14 +897,6 @@ namespace MWRender return; } - - const bool isPlayer = (mPtr == MWMechanics::getPlayer()); - - if (isPlayer) - { - Log(Debug::Verbose) << "groupname=" << groupname << ", start=" << start << ", stop=" << stop << ", accumRoot=" << mAccumRoot->getName(); - } - AnimStateMap::iterator stateiter = mStates.begin(); while(stateiter != mStates.end()) { diff --git a/apps/openmw/mwrender/camera.cpp b/apps/openmw/mwrender/camera.cpp index d87b61b53..eb70b3904 100644 --- a/apps/openmw/mwrender/camera.cpp +++ b/apps/openmw/mwrender/camera.cpp @@ -110,7 +110,6 @@ namespace MWRender osg::NodePathList nodepaths = trackNode->getParentalNodePaths(); if (nodepaths.empty()) return osg::Vec3d(); - osg::Matrix worldMat = osg::computeLocalToWorld(nodepaths[0]); osg::Vec3d position = worldMat.getTrans(); @@ -132,7 +131,6 @@ namespace MWRender return mCamera; } - void Camera::updateCamera() { updateCamera(mCamera); diff --git a/apps/openmw/mwrender/util.cpp b/apps/openmw/mwrender/util.cpp index 07433560e..b7ff3e962 100644 --- a/apps/openmw/mwrender/util.cpp +++ b/apps/openmw/mwrender/util.cpp @@ -70,7 +70,6 @@ MipmapCallback::~MipmapCallback() } - void MipmapCallback::operator()(osg::RenderInfo& renderInfo) const { auto* gl = renderInfo.getState()->get(); diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp index ddcb47b87..9d9788f29 100644 --- a/apps/openmw/mwworld/worldimp.cpp +++ b/apps/openmw/mwworld/worldimp.cpp @@ -3086,7 +3086,6 @@ namespace MWWorld float distance = getMaxActivationDistance(); osg::Vec3f dest = origin + direction * distance; - MWRender::RayResult result2 = mRendering->castRay(origin, dest, true, true); float dist1 = std::numeric_limits::max();