mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-22 11:09:40 +00:00
Code Issues Releases Wiki Activity

Formatting errors

Browse source
This commit is contained in:
Mads Buvik Sandvei 2020-07-05 12:18:54 +02:00
parent 76e6862c82
commit 69b4a4741f
10 changed files with 2 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/CMakeLists.txt
View file

@ -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) target_compile_options(openmw_vr PUBLIC -DUSE_OPENXR -DXR_USE_GRAPHICS_API_OPENGL -DXR_USE_PLATFORM_WIN32)
endif() endif()
# Sound stuff - here so CMake doesn't stupidly recompile EVERYTHING # Sound stuff - here so CMake doesn't stupidly recompile EVERYTHING
# when we change the backend. # when we change the backend.
include_directories( include_directories(

2
apps/openmw/engine.cpp
View file

@ -544,6 +544,7 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
gameControllerdb = globaldefault; gameControllerdb = globaldefault;
else else
gameControllerdb = ""; //if it doesn't exist, pass in an empty string gameControllerdb = ""; //if it doesn't exist, pass in an empty string
std::string myguiResources = (mResDir / "mygui").string(); std::string myguiResources = (mResDir / "mygui").string();
osg::ref_ptr<osg::Group> guiRoot = new osg::Group; osg::ref_ptr<osg::Group> guiRoot = new osg::Group;
guiRoot->setName("GUI Root"); guiRoot->setName("GUI Root");
@ -787,7 +788,6 @@ void OMW::Engine::go()
} }
else else
{ {
mViewer->eventTraversal(); mViewer->eventTraversal();
mViewer->updateTraversal(); mViewer->updateTraversal();

1
apps/openmw/engine.hpp
View file

@ -67,7 +67,6 @@ namespace osgViewer
class ScreenCaptureHandler; class ScreenCaptureHandler;
} }
struct SDL_Window; struct SDL_Window;
namespace OMW namespace OMW

1
apps/openmw/mwinput/inputmanagerimp.hpp
View file

@ -99,7 +99,6 @@ namespace MWInput
virtual bool controlsDisabled() { return mControlsDisabled; } virtual bool controlsDisabled() { return mControlsDisabled; }
protected: protected:
void convertMousePosForMyGUI(int& x, int& y); void convertMousePosForMyGUI(int& x, int& y);

1
apps/openmw/mwinput/mousemanager.cpp
View file

@ -249,6 +249,7 @@ namespace MWInput
{ {
mInputWrapper->warpMouse(static_cast<int>(mGuiCursorX / mInvUiScalingFactor), static_cast<int>(mGuiCursorY / mInvUiScalingFactor)); mInputWrapper->warpMouse(static_cast<int>(mGuiCursorX / mInvUiScalingFactor), static_cast<int>(mGuiCursorY / mInvUiScalingFactor));
} }
void MouseManager::setMousePosition(int x, int y) void MouseManager::setMousePosition(int x, int y)
{ {
mGuiCursorX = x * mInvUiScalingFactor; mGuiCursorX = x * mInvUiScalingFactor;

1
apps/openmw/mwmechanics/character.cpp
View file

@ -1679,7 +1679,6 @@ bool CharacterController::updateWeaponState(CharacterState& idle)
animPlaying = mAnimation->getInfo(mCurrentWeapon, &complete); animPlaying = mAnimation->getInfo(mCurrentWeapon, &complete);
if(mUpperBodyState == UpperCharState_MinAttackToMaxAttack && !isKnockedDown()) if(mUpperBodyState == UpperCharState_MinAttackToMaxAttack && !isKnockedDown())
mAttackStrength = complete; mAttackStrength = complete;
} }
else else
{ {

8
apps/openmw/mwrender/animation.cpp
View file

@ -897,14 +897,6 @@ namespace MWRender
return; 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(); AnimStateMap::iterator stateiter = mStates.begin();
while(stateiter != mStates.end()) while(stateiter != mStates.end())
{ {

2
apps/openmw/mwrender/camera.cpp
View file

@ -110,7 +110,6 @@ namespace MWRender
osg::NodePathList nodepaths = trackNode->getParentalNodePaths(); osg::NodePathList nodepaths = trackNode->getParentalNodePaths();
if (nodepaths.empty()) if (nodepaths.empty())
return osg::Vec3d(); return osg::Vec3d();
osg::Matrix worldMat = osg::computeLocalToWorld(nodepaths[0]); osg::Matrix worldMat = osg::computeLocalToWorld(nodepaths[0]);
osg::Vec3d position = worldMat.getTrans(); osg::Vec3d position = worldMat.getTrans();
@ -132,7 +131,6 @@ namespace MWRender
return mCamera; return mCamera;
} }
void Camera::updateCamera() void Camera::updateCamera()
{ {
updateCamera(mCamera); updateCamera(mCamera);

1
apps/openmw/mwrender/util.cpp
View file

@ -70,7 +70,6 @@ MipmapCallback::~MipmapCallback()
} }
void MipmapCallback::operator()(osg::RenderInfo& renderInfo) const void MipmapCallback::operator()(osg::RenderInfo& renderInfo) const
{ {
auto* gl = renderInfo.getState()->get<osg::GLExtensions>(); auto* gl = renderInfo.getState()->get<osg::GLExtensions>();

1
apps/openmw/mwworld/worldimp.cpp
View file

@ -3086,7 +3086,6 @@ namespace MWWorld
float distance = getMaxActivationDistance(); float distance = getMaxActivationDistance();
osg::Vec3f dest = origin + direction * distance; osg::Vec3f dest = origin + direction * distance;
MWRender::RayResult result2 = mRendering->castRay(origin, dest, true, true); MWRender::RayResult result2 = mRendering->castRay(origin, dest, true, true);
float dist1 = std::numeric_limits<float>::max(); float dist1 = std::numeric_limits<float>::max();