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

Rename Icon decoration into Symbol

Browse Source
This commit is contained in:
brunoherbelin
2020-07-06 21:43:23 +02:00
parent 124400c420
commit fa4611e33d
5 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Decorations.cpp
View File

@@ -301,7 +301,7 @@ void Handles::accept(Visitor& v)
} }
Icon::Icon(Type style, glm::vec3 pos) : Node() Symbol::Symbol(Type style, glm::vec3 pos) : Node()
{ {
static Mesh *icons[7] = {nullptr}; static Mesh *icons[7] = {nullptr};
if (icons[0] == nullptr) { if (icons[0] == nullptr) {
@@ -320,12 +320,12 @@ Icon::Icon(Type style, glm::vec3 pos) : Node()
} }
Icon::~Icon() Symbol::~Symbol()
{ {
} }
void Icon::draw(glm::mat4 modelview, glm::mat4 projection) void Symbol::draw(glm::mat4 modelview, glm::mat4 projection)
{ {
if ( !initialized() ) { if ( !initialized() ) {
if(icon_ && !icon_->initialized()) if(icon_ && !icon_->initialized())
@@ -350,7 +350,7 @@ void Icon::draw(glm::mat4 modelview, glm::mat4 projection)
} }
void Icon::accept(Visitor& v) void Symbol::accept(Visitor& v)
{ {
Node::accept(v); Node::accept(v);
v.visit(*this); v.visit(*this);

6
Decorations.h
View File

@@ -54,12 +54,12 @@ protected:
}; };
class Icon : public Node class Symbol : public Node
{ {
public: public:
typedef enum { GENERIC = 0, IMAGE, VIDEO, SESSION, CLONE, RENDER, EMPTY } Type; typedef enum { GENERIC = 0, IMAGE, VIDEO, SESSION, CLONE, RENDER, EMPTY } Type;
Icon(Type type = GENERIC, glm::vec3 pos = glm::vec3(0.f)); Symbol(Type type = GENERIC, glm::vec3 pos = glm::vec3(0.f));
~Icon(); ~Symbol();
void draw (glm::mat4 modelview, glm::mat4 projection) override; void draw (glm::mat4 modelview, glm::mat4 projection) override;
void accept (Visitor& v) override; void accept (Visitor& v) override;

8
MediaSource.cpp
View File

@@ -82,12 +82,12 @@ void MediaSource::init()
// icon in mixing view // icon in mixing view
if (mediaplayer_->duration() == GST_CLOCK_TIME_NONE) { if (mediaplayer_->duration() == GST_CLOCK_TIME_NONE) {
overlays_[View::MIXING]->attach( new Icon(Icon::IMAGE, glm::vec3(0.8f, 0.8f, 0.01f)) ); overlays_[View::MIXING]->attach( new Symbol(Symbol::IMAGE, glm::vec3(0.8f, 0.8f, 0.01f)) );
overlays_[View::LAYER]->attach( new Icon(Icon::IMAGE, glm::vec3(0.8f, 0.8f, 0.01f)) ); overlays_[View::LAYER]->attach( new Symbol(Symbol::IMAGE, glm::vec3(0.8f, 0.8f, 0.01f)) );
} }
else { else {
overlays_[View::MIXING]->attach( new Icon(Icon::VIDEO, glm::vec3(0.8f, 0.8f, 0.01f)) ); overlays_[View::MIXING]->attach( new Symbol(Symbol::VIDEO, glm::vec3(0.8f, 0.8f, 0.01f)) );
overlays_[View::LAYER]->attach( new Icon(Icon::VIDEO, glm::vec3(0.8f, 0.8f, 0.01f)) ); overlays_[View::LAYER]->attach( new Symbol(Symbol::VIDEO, glm::vec3(0.8f, 0.8f, 0.01f)) );
} }
// done init // done init

10
SessionSource.cpp
View File

@@ -60,7 +60,7 @@ SessionSource::SessionSource() : Source(), path_("")
overlays_[View::TRANSITION] = new Group; overlays_[View::TRANSITION] = new Group;
overlays_[View::TRANSITION]->translation_.z = 0.1; overlays_[View::TRANSITION]->translation_.z = 0.1;
overlays_[View::TRANSITION]->visible_ = false; overlays_[View::TRANSITION]->visible_ = false;
Icon *center = new Icon(Icon::GENERIC, glm::vec3(0.f, 0.f, 0.1f)); Symbol *center = new Symbol(Symbol::GENERIC, glm::vec3(0.f, 0.f, 0.1f));
overlays_[View::TRANSITION]->attach(center); overlays_[View::TRANSITION]->attach(center);
groups_[View::TRANSITION]->attach(overlays_[View::TRANSITION]); groups_[View::TRANSITION]->attach(overlays_[View::TRANSITION]);
@@ -149,8 +149,8 @@ void SessionSource::init()
attach(renderbuffer); attach(renderbuffer);
// icon in mixing view // icon in mixing view
overlays_[View::MIXING]->attach( new Icon(Icon::SESSION, glm::vec3(0.8f, 0.8f, 0.01f)) ); overlays_[View::MIXING]->attach( new Symbol(Symbol::SESSION, glm::vec3(0.8f, 0.8f, 0.01f)) );
overlays_[View::LAYER]->attach( new Icon(Icon::SESSION, glm::vec3(0.8f, 0.8f, 0.01f)) ); overlays_[View::LAYER]->attach( new Symbol(Symbol::SESSION, glm::vec3(0.8f, 0.8f, 0.01f)) );
// done init // done init
initialized_ = true; initialized_ = true;
@@ -252,8 +252,8 @@ void RenderSource::init()
attach(renderbuffer); attach(renderbuffer);
// icon in mixing view // icon in mixing view
overlays_[View::MIXING]->attach( new Icon(Icon::RENDER, glm::vec3(0.8f, 0.8f, 0.01f)) ); overlays_[View::MIXING]->attach( new Symbol(Symbol::RENDER, glm::vec3(0.8f, 0.8f, 0.01f)) );
overlays_[View::LAYER]->attach( new Icon(Icon::RENDER, glm::vec3(0.8f, 0.8f, 0.01f)) ); overlays_[View::LAYER]->attach( new Symbol(Symbol::RENDER, glm::vec3(0.8f, 0.8f, 0.01f)) );
// done init // done init
initialized_ = true; initialized_ = true;

6
Source.cpp
View File

@@ -49,7 +49,7 @@ Source::Source() : initialized_(false), active_(true), need_update_(true)
overlays_[View::MIXING] = new Group; overlays_[View::MIXING] = new Group;
overlays_[View::MIXING]->translation_.z = 0.1; overlays_[View::MIXING]->translation_.z = 0.1;
overlays_[View::MIXING]->visible_ = false; overlays_[View::MIXING]->visible_ = false;
Icon *center = new Icon(Icon::GENERIC, glm::vec3(0.f, 0.f, 0.1f)); Symbol *center = new Symbol(Symbol::GENERIC, glm::vec3(0.f, 0.f, 0.1f));
overlays_[View::MIXING]->attach(center); overlays_[View::MIXING]->attach(center);
groups_[View::MIXING]->attach(overlays_[View::MIXING]); groups_[View::MIXING]->attach(overlays_[View::MIXING]);
@@ -376,8 +376,8 @@ void CloneSource::init()
attach(renderbuffer); attach(renderbuffer);
// icon in mixing view // icon in mixing view
overlays_[View::MIXING]->attach( new Icon(Icon::CLONE, glm::vec3(0.8f, 0.8f, 0.01f)) ); overlays_[View::MIXING]->attach( new Symbol(Symbol::CLONE, glm::vec3(0.8f, 0.8f, 0.01f)) );
overlays_[View::LAYER]->attach( new Icon(Icon::CLONE, glm::vec3(0.8f, 0.8f, 0.01f)) ); overlays_[View::LAYER]->attach( new Symbol(Symbol::CLONE, glm::vec3(0.8f, 0.8f, 0.01f)) );
// done init // done init
initialized_ = true; initialized_ = true;