Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-23 11:04:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #4307 from Atlante45/fix_warnings

Browse source 
Fix warnings
This commit is contained in:
Andrew Meadows 2015-02-24 12:19:32 -08:00
commit 1b669af79d
3 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -48,7 +48,6 @@ QScriptValue HMDScriptingInterface::getHUDLookAtPosition2D(QScriptContext* conte
QScriptValue HMDScriptingInterface::getHUDLookAtPosition3D(QScriptContext* context, QScriptEngine* engine) { QScriptValue HMDScriptingInterface::getHUDLookAtPosition3D(QScriptContext* context, QScriptEngine* engine) {
glm::vec3 result; glm::vec3 result;
HMDScriptingInterface* hmdInterface = &HMDScriptingInterface::getInstance();
if ((&HMDScriptingInterface::getInstance())->getHUDLookAtPosition3D(result)) { if ((&HMDScriptingInterface::getInstance())->getHUDLookAtPosition3D(result)) {
return qScriptValueFromValue<glm::vec3>(engine, result); return qScriptValueFromValue<glm::vec3>(engine, result);
} }

2
interface/src/ui/ApplicationOverlay.cpp
View file

@ -136,10 +136,10 @@ ApplicationOverlay::ApplicationOverlay() :
_textureFov(glm::radians(DEFAULT_OCULUS_UI_ANGULAR_SIZE)), _textureFov(glm::radians(DEFAULT_OCULUS_UI_ANGULAR_SIZE)),
_textureAspectRatio(1.0f), _textureAspectRatio(1.0f),
_lastMouseMove(0), _lastMouseMove(0),
_magnifier(true),
_alpha(1.0f), _alpha(1.0f),
_oculusUIRadius(1.0f), _oculusUIRadius(1.0f),
_crosshairTexture(0), _crosshairTexture(0),
_magnifier(true),
_previousBorderWidth(-1), _previousBorderWidth(-1),
_previousBorderHeight(-1), _previousBorderHeight(-1),
_previousMagnifierBottomLeft(), _previousMagnifierBottomLeft(),

1
libraries/model/src/model/Light.cpp
View file

@ -76,7 +76,6 @@ void Light::setSpotAngle(float angle) {
if (angle <= 0.f) { if (angle <= 0.f) {
angle = 0.0f; angle = 0.0f;
} }
float cosAngle = cos(angle);
editSchema()._spot.x = cos(angle); editSchema()._spot.x = cos(angle);
editSchema()._spot.y = sin(angle); editSchema()._spot.y = sin(angle);
editSchema()._spot.z = angle; editSchema()._spot.z = angle;