mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-02-26 14:58:51 -06:00
Clang compile fixes
This commit is contained in:
@@ -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));
|
||||
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user