Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-19 10:18:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

warnings

Browse source
This commit is contained in:
SamGondelman 2017-07-25 10:16:50 -07:00
parent 3c8b964cc9
commit 3149c3e16c
3 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/scripting/HMDScriptingInterface.cpp
View file

@ -91,7 +91,7 @@ void HMDScriptingInterface::activateHMDHandMouse() {
void HMDScriptingInterface::deactivateHMDHandMouse() {
QWriteLocker lock(&_hmdHandMouseLock);
_hmdHandMouseCount = std::max(--_hmdHandMouseCount, 0);
_hmdHandMouseCount = std::max(_hmdHandMouseCount - 1, 0);
if (_hmdHandMouseCount == 0) {
auto offscreenUi = DependencyManager::get<OffscreenUi>();
offscreenUi->getDesktop()->setProperty("hmdHandMouseActive", false);

4
interface/src/ui/overlays/Overlay.cpp
View file

@ -29,8 +29,8 @@ Overlay::Overlay() :
_alphaPulse(0.0f),
_colorPulse(0.0f),
_color(DEFAULT_OVERLAY_COLOR),
_drawHUDLayer(false),
_visible(true),
_drawHUDLayer(false),
_anchor(NO_ANCHOR)
{
}
@ -48,8 +48,8 @@ Overlay::Overlay(const Overlay* overlay) :
_alphaPulse(overlay->_alphaPulse),
_colorPulse(overlay->_colorPulse),
_color(overlay->_color),
_drawHUDLayer(overlay->_drawHUDLayer),
_visible(overlay->_visible),
_drawHUDLayer(overlay->_drawHUDLayer),
_anchor(overlay->_anchor)
{
}

9
libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
View file

@ -42,17 +42,10 @@ static const bool DEFAULT_MONO_VIEW = true;
static const bool DEFAULT_DISABLE_PREVIEW = false;
#endif
static const glm::mat4 IDENTITY_MATRIX;
static const size_t NUMBER_OF_HANDS = 2;
//#define LIVE_SHADER_RELOAD 1
extern glm::vec3 getPoint(float yaw, float pitch);
struct HandLaserData {
vec4 p1;
vec4 p2;
vec4 color;
};
static QString readFile(const QString& filename) {
QFile file(filename);
file.open(QFile::Text | QFile::ReadOnly);
@ -115,8 +108,6 @@ void HmdDisplayPlugin::internalDeactivate() {
Parent::internalDeactivate();
}
static const int32_t LINE_DATA_SLOT = 1;
void HmdDisplayPlugin::customizeContext() {
Parent::customizeContext();
_overlayRenderer.build();