eessppeelllloo/vimix
1
0
Fork 0
mirror of https://github.com/brunoherbelin/vimix.git synced 2025-12-11 18:34:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

various minor OSX compilation update

Browse Source
This commit is contained in:
brunoherbelin
2020-10-31 19:21:21 +01:00
parent 8ef79a6dbd
commit 44901b1e78
4 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
GlmToolkit.cpp
View File

@@ -33,7 +33,7 @@ GlmToolkit::AxisAlignedBoundingBox::AxisAlignedBoundingBox() {
mMax = glm::vec3(-1.f); 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()) { if (isNull()) {
mMin = point; mMin = point;

11
Primitives.cpp
View File

@@ -137,13 +137,12 @@ void MediaSurface::init()
void MediaSurface::draw(glm::mat4 modelview, glm::mat4 projection) void MediaSurface::draw(glm::mat4 modelview, glm::mat4 projection)
{ {
if ( !initialized() ) if ( !initialized() ) {
init(); init();
// set the texture to the media player once openned
// set the texture to the media player once openned if ( mediaplayer_->isOpen() )
// TODO: avoid to repeat with a static flag? textureindex_ = mediaplayer_->texture();
if ( mediaplayer_->isOpen() ) }
textureindex_ = mediaplayer_->texture();
Surface::draw(modelview, projection); Surface::draw(modelview, projection);
} }

8
SessionVisitor.cpp
View File

@@ -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); xmlCurrent_->InsertEndChild(image);
} }
void SessionVisitor::visit(FrameBufferSurface &n) void SessionVisitor::visit(FrameBufferSurface &)
{ {
// Node of a different type // Node of a different type
xmlCurrent_->SetAttribute("type", "FrameBufferSurface"); 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 // Node of a different type
xmlCurrent_->SetAttribute("type", "LineCircle"); xmlCurrent_->SetAttribute("type", "LineCircle");
@@ -373,7 +373,7 @@ void SessionVisitor::visit (SessionSource& s)
path->InsertEndChild( text ); path->InsertEndChild( text );
} }
void SessionVisitor::visit (RenderSource& s) void SessionVisitor::visit (RenderSource&)
{ {
xmlCurrent_->SetAttribute("type", "RenderSource"); xmlCurrent_->SetAttribute("type", "RenderSource");
} }

8
SessionVisitor.h
View File

@@ -24,13 +24,13 @@ public:
void visit(Group& n) override; void visit(Group& n) override;
void visit(Switch& n) override; void visit(Switch& n) override;
void visit(Primitive& n) override; void visit(Primitive& n) override;
void visit(Surface& n) override; void visit(Surface&) override;
void visit(ImageSurface& n) override; void visit(ImageSurface& n) override;
void visit(MediaSurface& n) override; void visit(MediaSurface& n) override;
void visit(FrameBufferSurface& n) override; void visit(FrameBufferSurface&) override;
void visit(LineStrip& n) override; void visit(LineStrip& n) override;
void visit(LineSquare&) override; void visit(LineSquare&) override;
void visit(LineCircle& n) override; void visit(LineCircle&) override;
void visit(Mesh& n) override; void visit(Mesh& n) override;
void visit(Frame& n) override; void visit(Frame& n) override;
@@ -44,7 +44,7 @@ public:
void visit (Source& s) override; void visit (Source& s) override;
void visit (MediaSource& s) override; void visit (MediaSource& s) override;
void visit (SessionSource& s) override; void visit (SessionSource& s) override;
void visit (RenderSource& s) override; void visit (RenderSource&) override;
void visit (CloneSource& s) override; void visit (CloneSource& s) override;
void visit (PatternSource& s) override; void visit (PatternSource& s) override;
void visit (DeviceSource& s) override; void visit (DeviceSource& s) override;