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

OSX compilation fix.

Browse Source
This commit is contained in:
brunoherbelin
2020-05-19 12:44:33 +02:00
parent becddf0b5f
commit 1cdc363194
6 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
GarbageVisitor.cpp
View File

@@ -9,7 +9,7 @@ GarbageVisitor::GarbageVisitor(Node *nodetocollect) : Visitor()
{ {
targets_.push_front(nodetocollect); targets_.push_front(nodetocollect);
current_ = nullptr; current_ = nullptr;
found_ == false; found_ = false;
} }
GarbageVisitor::GarbageVisitor(Source *sourcetocollect) : Visitor() GarbageVisitor::GarbageVisitor(Source *sourcetocollect) : Visitor()
@@ -18,7 +18,7 @@ GarbageVisitor::GarbageVisitor(Source *sourcetocollect) : Visitor()
targets_.push_front(sourcetocollect->group(View::GEOMETRY)); targets_.push_front(sourcetocollect->group(View::GEOMETRY));
targets_.push_front(sourcetocollect->group(View::RENDERING)); targets_.push_front(sourcetocollect->group(View::RENDERING));
current_ = nullptr; current_ = nullptr;
found_ == false; found_ = false;
} }

3
Mesh.cpp
View File

@@ -10,6 +10,7 @@
#include <glm/gtc/matrix_transform.hpp> #include <glm/gtc/matrix_transform.hpp>
#include "RenderingManager.h"
#include "Primitives.h" #include "Primitives.h"
#include "Resource.h" #include "Resource.h"
#include "ImageShader.h" #include "ImageShader.h"
@@ -472,7 +473,7 @@ Handles::Handles(Type type) : Node(), type_(type)
handle_ = new Mesh("mesh/border_handles_rotation.ply"); handle_ = new Mesh("mesh/border_handles_rotation.ply");
} }
else { else {
handle_ = new LineSquare(color, 2); handle_ = new LineSquare(color, int ( 8.1f /** Rendering::manager().DPIScale()*/) );
handle_->scale_ = glm::vec3( 0.05f, 0.05f, 1.f); handle_->scale_ = glm::vec3( 0.05f, 0.05f, 1.f);
} }

4
Mixer.cpp
View File

@@ -200,6 +200,7 @@ void Mixer::insertSource(Source *s)
mixing_.scene.fg()->attach(s->group(View::MIXING)); mixing_.scene.fg()->attach(s->group(View::MIXING));
geometry_.scene.fg()->attach(s->group(View::GEOMETRY)); geometry_.scene.fg()->attach(s->group(View::GEOMETRY));
layer_.scene.fg()->attach(s->group(View::LAYER)); layer_.scene.fg()->attach(s->group(View::LAYER));
} }
void Mixer::deleteCurrentSource() void Mixer::deleteCurrentSource()
@@ -423,6 +424,9 @@ void Mixer::swap()
// set resolution // set resolution
session_->setResolution( session_->config(View::RENDERING)->scale_ ); session_->setResolution( session_->config(View::RENDERING)->scale_ );
// request reordering in depth for views
View::need_reordering_ = true;
// no current source // no current source
current_source_ = session_->end(); current_source_ = session_->end();
current_source_index_ = -1; current_source_index_ = -1;

4
Primitives.cpp
View File

@@ -251,7 +251,7 @@ void LineStrip::draw(glm::mat4 modelview, glm::mat4 projection)
init(); init();
glLineWidth(linewidth_); glLineWidth(linewidth_);
// glEnable(GL_LINE_SMOOTH);
// enable antialiasing // enable antialiasing
glEnable(GL_MULTISAMPLE_ARB); glEnable(GL_MULTISAMPLE_ARB);
@@ -259,7 +259,7 @@ void LineStrip::draw(glm::mat4 modelview, glm::mat4 projection)
glLineWidth(1); glLineWidth(1);
glDisable(GL_MULTISAMPLE_ARB); glDisable(GL_MULTISAMPLE_ARB);
// glDisable(GL_LINE_SMOOTH);
} }
void LineStrip::accept(Visitor& v) void LineStrip::accept(Visitor& v)

15
RenderingManager.cpp
View File

@@ -143,7 +143,6 @@ bool Rendering::Init()
gst_init (NULL, NULL); gst_init (NULL, NULL);
// Antialiasing // Antialiasing
glHint(GL_LINE_SMOOTH_HINT, GL_NICEST);
glHint(GL_MULTISAMPLE_FILTER_HINT_NV, GL_NICEST); glHint(GL_MULTISAMPLE_FILTER_HINT_NV, GL_NICEST);
// This hint can improve the speed of texturing when perspective-correct texture coordinate interpolation isn't needed // This hint can improve the speed of texturing when perspective-correct texture coordinate interpolation isn't needed
glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST); glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST);
@@ -158,12 +157,12 @@ bool Rendering::Init()
#elif GST_GL_HAVE_PLATFORM_CGL #elif GST_GL_HAVE_PLATFORM_CGL
// global_display = GST_GL_DISPLAY ( glfwGetCocoaMonitor(window) ); // global_display = GST_GL_DISPLAY ( glfwGetCocoaMonitor(main_window_) );
// global_display = GST_GL_DISPLAY (gst_gl_display_cocoa_new ()); global_display = GST_GL_DISPLAY (gst_gl_display_cocoa_new ());
// global_gl_context = gst_gl_context_new_wrapped (global_display, global_gl_context = gst_gl_context_new_wrapped (global_display,
// (guintptr) 0, (guintptr) 0,
// GST_GL_PLATFORM_CGL, GST_GL_API_OPENGL); GST_GL_PLATFORM_CGL, GST_GL_API_OPENGL);
#elif GST_GL_HAVE_PLATFORM_GLX #elif GST_GL_HAVE_PLATFORM_GLX
@@ -433,7 +432,7 @@ float Rendering::AspectRatio()
return static_cast<float>(main_window_attributes_.viewport.x) / static_cast<float>(main_window_attributes_.viewport.y); return static_cast<float>(main_window_attributes_.viewport.x) / static_cast<float>(main_window_attributes_.viewport.y);
} }
void Rendering::FileDropped(GLFWwindow* window, int path_count, const char* paths[]) void Rendering::FileDropped(GLFWwindow *, int path_count, const char* paths[])
{ {
for (int i = 0; i < path_count; ++i) { for (int i = 0; i < path_count; ++i) {
std::string filename(paths[i]); std::string filename(paths[i]);
@@ -475,7 +474,7 @@ void Rendering::RequestScreenshot()
// //
static GstBusSyncReply static GstBusSyncReply
bus_sync_handler (GstBus * bus, GstMessage * msg, gpointer user_data) bus_sync_handler (GstBus *, GstMessage * msg, gpointer )
{ {
if (GST_MESSAGE_TYPE(msg) == GST_MESSAGE_NEED_CONTEXT) { if (GST_MESSAGE_TYPE(msg) == GST_MESSAGE_NEED_CONTEXT) {
const gchar* contextType; const gchar* contextType;

2
Source.h
View File

@@ -141,7 +141,7 @@ public:
protected: protected:
void init(); void init() override;
Surface *mediasurface_; Surface *mediasurface_;
std::string path_; std::string path_;