From 965f3eded0e7250208714c0fb498ef23c72b8219 Mon Sep 17 00:00:00 2001 From: Alexander Bock Date: Thu, 8 Sep 2016 13:22:34 +0200 Subject: [PATCH] Clang compile fixes --- modules/base/rendering/modelgeometry.cpp | 6 +++--- modules/newhorizons/util/projectioncomponent.h | 2 +- src/interaction/interactionhandler.cpp | 4 ++-- src/scene/scenegraphnode.cpp | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/base/rendering/modelgeometry.cpp b/modules/base/rendering/modelgeometry.cpp index 507e38ce81..655c883a2e 100644 --- a/modules/base/rendering/modelgeometry.cpp +++ b/modules/base/rendering/modelgeometry.cpp @@ -125,9 +125,9 @@ bool ModelGeometry::initialize(Renderable* parent) { for (auto v: _vertices) { maximumDistanceSquared = glm::max( - glm::pow(v.location[0], 2) + - glm::pow(v.location[1], 2) + - glm::pow(v.location[2], 2), maximumDistanceSquared); + glm::pow(v.location[0], 2.f) + + glm::pow(v.location[1], 2.f) + + glm::pow(v.location[2], 2.f), maximumDistanceSquared); } _parent->setBoundingSphere(PowerScaledScalar(glm::sqrt(maximumDistanceSquared), 0.0)); diff --git a/modules/newhorizons/util/projectioncomponent.h b/modules/newhorizons/util/projectioncomponent.h index 9a38a233e2..6bae9afa6f 100644 --- a/modules/newhorizons/util/projectioncomponent.h +++ b/modules/newhorizons/util/projectioncomponent.h @@ -56,7 +56,7 @@ public: bool initializeProjectionSettings(const ghoul::Dictionary& dictionary); bool initializeParser(const ghoul::Dictionary& dictionary); - ghoul::opengl::Texture& ProjectionComponent::depthTexture(); + ghoul::opengl::Texture& depthTexture(); void imageProjectBegin(); void imageProjectEnd(); void depthMapRenderBegin(); diff --git a/src/interaction/interactionhandler.cpp b/src/interaction/interactionhandler.cpp index f1bf90b1aa..a496a6b636 100644 --- a/src/interaction/interactionhandler.cpp +++ b/src/interaction/interactionhandler.cpp @@ -1019,14 +1019,14 @@ void InteractionHandler::clearKeyframes() { } void InteractionHandler::serialize(SyncBuffer* syncBuffer) { - for each (auto var in _interactionModes) + for (auto var : _interactionModes) { var.second->serialize(syncBuffer); } } void InteractionHandler::deserialize(SyncBuffer* syncBuffer) { - for each (auto var in _interactionModes) + for (auto var : _interactionModes) { var.second->deserialize(syncBuffer); } diff --git a/src/scene/scenegraphnode.cpp b/src/scene/scenegraphnode.cpp index 370a1692be..3ac738de27 100644 --- a/src/scene/scenegraphnode.cpp +++ b/src/scene/scenegraphnode.cpp @@ -592,7 +592,7 @@ SceneGraphNode* SceneGraphNode::childNode(const std::string& name) void SceneGraphNode::updateCamera(Camera* camera) const{ - psc origin = worldPosition(); + psc origin(worldPosition()); //int i = 0; // the camera position