From 44901b1e78be4a20683e3a6e8316a20ec2bdadda Mon Sep 17 00:00:00 2001 From: brunoherbelin Date: Sat, 31 Oct 2020 19:21:21 +0100 Subject: [PATCH] various minor OSX compilation update --- GlmToolkit.cpp | 2 +- Primitives.cpp | 11 +++++------ SessionVisitor.cpp | 8 ++++---- SessionVisitor.h | 8 ++++---- 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/GlmToolkit.cpp b/GlmToolkit.cpp index fdb10d3..ebeb03a 100644 --- a/GlmToolkit.cpp +++ b/GlmToolkit.cpp @@ -33,7 +33,7 @@ GlmToolkit::AxisAlignedBoundingBox::AxisAlignedBoundingBox() { mMax = glm::vec3(-1.f); } -void GlmToolkit::AxisAlignedBoundingBox::extend(const glm::vec3& point) // TODO why ref to point? +void GlmToolkit::AxisAlignedBoundingBox::extend(const glm::vec3& point) { if (isNull()) { mMin = point; diff --git a/Primitives.cpp b/Primitives.cpp index 9535233..25d12e1 100644 --- a/Primitives.cpp +++ b/Primitives.cpp @@ -137,13 +137,12 @@ void MediaSurface::init() void MediaSurface::draw(glm::mat4 modelview, glm::mat4 projection) { - if ( !initialized() ) + if ( !initialized() ) { init(); - - // set the texture to the media player once openned - // TODO: avoid to repeat with a static flag? - if ( mediaplayer_->isOpen() ) - textureindex_ = mediaplayer_->texture(); + // set the texture to the media player once openned + if ( mediaplayer_->isOpen() ) + textureindex_ = mediaplayer_->texture(); + } Surface::draw(modelview, projection); } diff --git a/SessionVisitor.cpp b/SessionVisitor.cpp index 3dab26b..7ef0dbf 100644 --- a/SessionVisitor.cpp +++ b/SessionVisitor.cpp @@ -113,7 +113,7 @@ void SessionVisitor::visit(Primitive &n) } -void SessionVisitor::visit(Surface &n) +void SessionVisitor::visit(Surface &) { } @@ -129,7 +129,7 @@ void SessionVisitor::visit(ImageSurface &n) xmlCurrent_->InsertEndChild(image); } -void SessionVisitor::visit(FrameBufferSurface &n) +void SessionVisitor::visit(FrameBufferSurface &) { // Node of a different type xmlCurrent_->SetAttribute("type", "FrameBufferSurface"); @@ -270,7 +270,7 @@ void SessionVisitor::visit(LineSquare &) } -void SessionVisitor::visit(LineCircle &n) +void SessionVisitor::visit(LineCircle &) { // Node of a different type xmlCurrent_->SetAttribute("type", "LineCircle"); @@ -373,7 +373,7 @@ void SessionVisitor::visit (SessionSource& s) path->InsertEndChild( text ); } -void SessionVisitor::visit (RenderSource& s) +void SessionVisitor::visit (RenderSource&) { xmlCurrent_->SetAttribute("type", "RenderSource"); } diff --git a/SessionVisitor.h b/SessionVisitor.h index 39e343c..94b48e8 100644 --- a/SessionVisitor.h +++ b/SessionVisitor.h @@ -24,13 +24,13 @@ public: void visit(Group& n) override; void visit(Switch& n) override; void visit(Primitive& n) override; - void visit(Surface& n) override; + void visit(Surface&) override; void visit(ImageSurface& n) override; void visit(MediaSurface& n) override; - void visit(FrameBufferSurface& n) override; + void visit(FrameBufferSurface&) override; void visit(LineStrip& n) override; void visit(LineSquare&) override; - void visit(LineCircle& n) override; + void visit(LineCircle&) override; void visit(Mesh& n) override; void visit(Frame& n) override; @@ -44,7 +44,7 @@ public: void visit (Source& s) override; void visit (MediaSource& s) override; void visit (SessionSource& s) override; - void visit (RenderSource& s) override; + void visit (RenderSource&) override; void visit (CloneSource& s) override; void visit (PatternSource& s) override; void visit (DeviceSource& s) override;