mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-07-21 18:14:04 +00:00
Code Issues Releases Wiki Activity

Vismasked moved to SceneUtil in merge, fixed references.

Browse source
This commit is contained in:
Mads Buvik Sandvei 2020-03-30 02:04:27 +02:00
parent 14bb0f0208
commit eab8326841
5 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwvr/openxrmanagerimpl.hpp
View file

@ -4,10 +4,10 @@
#include "openxrmanager.hpp" #include "openxrmanager.hpp"
#include "openxrlayer.hpp" #include "openxrlayer.hpp"
#include "../mwinput/inputmanagerimp.hpp" #include "../mwinput/inputmanagerimp.hpp"
#include "../mwrender/vismask.hpp"
#include <components/debug/debuglog.hpp> #include <components/debug/debuglog.hpp>
#include <components/sdlutil/sdlgraphicswindow.hpp> #include <components/sdlutil/sdlgraphicswindow.hpp>
#include <components/sceneutil/vismask.hpp>
// The OpenXR SDK assumes we've included Windows.h // The OpenXR SDK assumes we've included Windows.h
#include <Windows.h> #include <Windows.h>

4
apps/openmw/mwvr/openxrmenu.cpp
View file

@ -51,8 +51,8 @@ public:
setComputeNearFarMode(osg::CullSettings::DO_NOT_COMPUTE_NEAR_FAR); setComputeNearFarMode(osg::CullSettings::DO_NOT_COMPUTE_NEAR_FAR);
setName("MenuCamera"); setName("MenuCamera");
setCullMask(MWRender::Mask_GUI); setCullMask(SceneUtil::Mask_GUI);
setNodeMask(MWRender::Mask_RenderToTexture); setNodeMask(SceneUtil::Mask_RenderToTexture);
unsigned int rttSize = 4000; unsigned int rttSize = 4000;
setViewport(0, 0, rttSize, rttSize); setViewport(0, 0, rttSize, rttSize);

8
apps/openmw/mwvr/openxrviewer.cpp
View file

@ -4,7 +4,6 @@
#include "openxrinputmanager.hpp" #include "openxrinputmanager.hpp"
#include "vrenvironment.hpp" #include "vrenvironment.hpp"
#include "Windows.h" #include "Windows.h"
#include "../mwrender/vismask.hpp"
#include "../mwmechanics/actorutil.hpp" #include "../mwmechanics/actorutil.hpp"
#include "../mwbase/world.hpp" #include "../mwbase/world.hpp"
#include "../mwbase/environment.hpp" #include "../mwbase/environment.hpp"
@ -12,6 +11,7 @@
#include "../mwworld/player.hpp" #include "../mwworld/player.hpp"
#include "../mwworld/esmstore.hpp" #include "../mwworld/esmstore.hpp"
#include <components/esm/loadrace.hpp> #include <components/esm/loadrace.hpp>
#include <components/sceneutil/vismask.hpp>
#include <osg/MatrixTransform> #include <osg/MatrixTransform>
namespace MWVR namespace MWVR
@ -80,7 +80,7 @@ namespace MWVR
// Use the main camera to render any GUI to the OpenXR GUI quad's swapchain. // Use the main camera to render any GUI to the OpenXR GUI quad's swapchain.
// (When swapping the window buffer we'll blit the mirror texture to it instead.) // (When swapping the window buffer we'll blit the mirror texture to it instead.)
mainCamera->setCullMask(MWRender::Mask_GUI); mainCamera->setCullMask(SceneUtil::Mask_GUI);
osg::Vec4 clearColor = mainCamera->getClearColor(); osg::Vec4 clearColor = mainCamera->getClearColor();
@ -117,8 +117,8 @@ namespace MWVR
rightCamera->setFinalDrawCallback(mPostDraw); rightCamera->setFinalDrawCallback(mPostDraw);
// Stereo cameras should only draw the scene (AR layers should later add minimap, health, etc.) // Stereo cameras should only draw the scene (AR layers should later add minimap, health, etc.)
leftCamera->setCullMask(~MWRender::Mask_GUI); leftCamera->setCullMask(~SceneUtil::Mask_GUI);
rightCamera->setCullMask(~MWRender::Mask_GUI); rightCamera->setCullMask(~SceneUtil::Mask_GUI);
leftCamera->setName("LeftEye"); leftCamera->setName("LeftEye");
rightCamera->setName("RightEye"); rightCamera->setName("RightEye");

2
apps/openmw/mwvr/openxrworldview.cpp
View file

@ -7,12 +7,12 @@
#include <components/debug/debuglog.hpp> #include <components/debug/debuglog.hpp>
#include <components/sdlutil/sdlgraphicswindow.hpp> #include <components/sdlutil/sdlgraphicswindow.hpp>
#include <components/sceneutil/vismask.hpp>
#include <Windows.h> #include <Windows.h>
#include <openxr/openxr.h> #include <openxr/openxr.h>
#include "../mwrender/vismask.hpp"
#include "../mwbase/environment.hpp" #include "../mwbase/environment.hpp"
#include "../mwbase/world.hpp" #include "../mwbase/world.hpp"
#include "../mwrender/renderingmanager.hpp" #include "../mwrender/renderingmanager.hpp"

2
apps/openmw/mwvr/vranimation.cpp
View file

@ -24,6 +24,7 @@
#include <components/sceneutil/attach.hpp> #include <components/sceneutil/attach.hpp>
#include <components/sceneutil/clone.hpp> #include <components/sceneutil/clone.hpp>
#include <components/sceneutil/visitor.hpp> #include <components/sceneutil/visitor.hpp>
#include <components/sceneutil/vismask.hpp>
#include <components/sceneutil/skeleton.hpp> #include <components/sceneutil/skeleton.hpp>
#include <components/sceneutil/riggeometry.hpp> #include <components/sceneutil/riggeometry.hpp>
#include <components/sceneutil/positionattitudetransform.hpp> #include <components/sceneutil/positionattitudetransform.hpp>
@ -52,7 +53,6 @@
#include "../mwrender/camera.hpp" #include "../mwrender/camera.hpp"
#include "../mwrender/rotatecontroller.hpp" #include "../mwrender/rotatecontroller.hpp"
#include "../mwrender/renderbin.hpp" #include "../mwrender/renderbin.hpp"
#include "../mwrender/vismask.hpp"
#include "../mwrender/renderingmanager.hpp" #include "../mwrender/renderingmanager.hpp"
#include "../mwrender/objects.hpp" #include "../mwrender/objects.hpp"