mirror of
https://github.com/brunoherbelin/vimix.git
synced 2025-12-11 18:34:58 +01:00
Increased size of source icon
This commit is contained in:
@@ -331,7 +331,8 @@ DeviceSource::DeviceSource() : StreamSource()
|
|||||||
stream_ = new Stream;
|
stream_ = new Stream;
|
||||||
|
|
||||||
// set symbol
|
// set symbol
|
||||||
symbol_ = new Symbol(Symbol::CAMERA, glm::vec3(0.8f, 0.8f, 0.01f));
|
symbol_ = new Symbol(Symbol::CAMERA, glm::vec3(0.75f, 0.75f, 0.01f));
|
||||||
|
symbol_->scale_.y = 1.5f;
|
||||||
}
|
}
|
||||||
|
|
||||||
DeviceSource::~DeviceSource()
|
DeviceSource::~DeviceSource()
|
||||||
|
|||||||
@@ -79,9 +79,10 @@ void MediaSource::init()
|
|||||||
|
|
||||||
// icon in mixing view
|
// icon in mixing view
|
||||||
if (mediaplayer_->isImage())
|
if (mediaplayer_->isImage())
|
||||||
symbol_ = new Symbol(Symbol::IMAGE, glm::vec3(0.8f, 0.8f, 0.01f));
|
symbol_ = new Symbol(Symbol::IMAGE, glm::vec3(0.75f, 0.75f, 0.01f));
|
||||||
else
|
else
|
||||||
symbol_ = new Symbol(Symbol::VIDEO, glm::vec3(0.8f, 0.8f, 0.01f));
|
symbol_ = new Symbol(Symbol::VIDEO, glm::vec3(0.75f, 0.75f, 0.01f));
|
||||||
|
symbol_->scale_.y = 1.5f;
|
||||||
|
|
||||||
// set the renderbuffer of the source and attach rendering nodes
|
// set the renderbuffer of the source and attach rendering nodes
|
||||||
attach(renderbuffer);
|
attach(renderbuffer);
|
||||||
|
|||||||
@@ -274,8 +274,8 @@ NetworkSource::NetworkSource() : StreamSource()
|
|||||||
stream_ = (Stream *) new NetworkStream;
|
stream_ = (Stream *) new NetworkStream;
|
||||||
|
|
||||||
// set symbol
|
// set symbol
|
||||||
symbol_ = new Symbol(Symbol::SHARE, glm::vec3(0.8f, 0.8f, 0.01f));
|
symbol_ = new Symbol(Symbol::SHARE, glm::vec3(0.75f, 0.75f, 0.01f));
|
||||||
|
symbol_->scale_.y = 1.5f;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -137,7 +137,8 @@ PatternSource::PatternSource() : StreamSource()
|
|||||||
stream_ = (Stream *) new Pattern;
|
stream_ = (Stream *) new Pattern;
|
||||||
|
|
||||||
// set symbol
|
// set symbol
|
||||||
symbol_ = new Symbol(Symbol::PATTERN, glm::vec3(0.8f, 0.8f, 0.01f));
|
symbol_ = new Symbol(Symbol::PATTERN, glm::vec3(0.75f, 0.75f, 0.01f));
|
||||||
|
symbol_->scale_.y = 1.5f;
|
||||||
}
|
}
|
||||||
|
|
||||||
void PatternSource::setPattern(uint type, glm::ivec2 resolution)
|
void PatternSource::setPattern(uint type, glm::ivec2 resolution)
|
||||||
|
|||||||
@@ -48,7 +48,8 @@ SessionSource::SessionSource() : Source(), path_("")
|
|||||||
groups_[View::TRANSITION]->attach(overlays_[View::TRANSITION]);
|
groups_[View::TRANSITION]->attach(overlays_[View::TRANSITION]);
|
||||||
|
|
||||||
// set symbol
|
// set symbol
|
||||||
symbol_ = new Symbol(Symbol::SESSION, glm::vec3(0.8f, 0.8f, 0.01f));
|
symbol_ = new Symbol(Symbol::SESSION, glm::vec3(0.75f, 0.75f, 0.01f));
|
||||||
|
symbol_->scale_.y = 1.5f;
|
||||||
|
|
||||||
failed_ = false;
|
failed_ = false;
|
||||||
wait_for_sources_ = false;
|
wait_for_sources_ = false;
|
||||||
@@ -221,7 +222,8 @@ void SessionSource::accept(Visitor& v)
|
|||||||
RenderSource::RenderSource(Session *session) : Source(), session_(session)
|
RenderSource::RenderSource(Session *session) : Source(), session_(session)
|
||||||
{
|
{
|
||||||
// set symbol
|
// set symbol
|
||||||
symbol_ = new Symbol(Symbol::RENDER, glm::vec3(0.8f, 0.8f, 0.01f));
|
symbol_ = new Symbol(Symbol::RENDER, glm::vec3(0.75f, 0.75f, 0.01f));
|
||||||
|
symbol_->scale_.y = 1.5f;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
12
Source.cpp
12
Source.cpp
@@ -440,9 +440,14 @@ void Source::setLocked (bool on)
|
|||||||
// the lock icon is visible when locked
|
// the lock icon is visible when locked
|
||||||
locker_->visible_ = on;
|
locker_->visible_ = on;
|
||||||
|
|
||||||
// a locked source is not visible in the GEOMETRY view (that's the whole point of it!)
|
}
|
||||||
groups_[View::GEOMETRY]->visible_ = !locked_;
|
|
||||||
|
|
||||||
|
void Source::setFixed (bool on)
|
||||||
|
{
|
||||||
|
fixed_ = on;
|
||||||
|
|
||||||
|
groups_[View::GEOMETRY]->visible_ = !fixed_;
|
||||||
|
groups_[View::MIXING]->visible_ = !fixed_;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -677,7 +682,8 @@ CloneSource *Source::clone()
|
|||||||
CloneSource::CloneSource(Source *origin) : Source(), origin_(origin)
|
CloneSource::CloneSource(Source *origin) : Source(), origin_(origin)
|
||||||
{
|
{
|
||||||
// set symbol
|
// set symbol
|
||||||
symbol_ = new Symbol(Symbol::CLONE, glm::vec3(0.8f, 0.8f, 0.01f));
|
symbol_ = new Symbol(Symbol::CLONE, glm::vec3(0.75f, 0.75f, 0.01f));
|
||||||
|
symbol_->scale_.y = 1.5f;
|
||||||
}
|
}
|
||||||
|
|
||||||
CloneSource::~CloneSource()
|
CloneSource::~CloneSource()
|
||||||
|
|||||||
5
Source.h
5
Source.h
@@ -103,6 +103,10 @@ public:
|
|||||||
virtual void setLocked (bool on);
|
virtual void setLocked (bool on);
|
||||||
inline bool locked () { return locked_; }
|
inline bool locked () { return locked_; }
|
||||||
|
|
||||||
|
// lock mode
|
||||||
|
virtual void setFixed (bool on);
|
||||||
|
inline bool fixed () { return fixed_; }
|
||||||
|
|
||||||
// a Source shall informs if the source failed (i.e. shall be deleted)
|
// a Source shall informs if the source failed (i.e. shall be deleted)
|
||||||
virtual bool failed () const = 0;
|
virtual bool failed () const = 0;
|
||||||
|
|
||||||
@@ -205,6 +209,7 @@ protected:
|
|||||||
// update
|
// update
|
||||||
bool active_;
|
bool active_;
|
||||||
bool locked_;
|
bool locked_;
|
||||||
|
bool fixed_;
|
||||||
bool need_update_;
|
bool need_update_;
|
||||||
float dt_;
|
float dt_;
|
||||||
Group *stored_status_;
|
Group *stored_status_;
|
||||||
|
|||||||
@@ -18,7 +18,8 @@ GenericStreamSource::GenericStreamSource() : StreamSource()
|
|||||||
stream_ = new Stream;
|
stream_ = new Stream;
|
||||||
|
|
||||||
// set symbol
|
// set symbol
|
||||||
symbol_ = new Symbol(Symbol::EMPTY, glm::vec3(0.8f, 0.8f, 0.01f));
|
symbol_ = new Symbol(Symbol::EMPTY, glm::vec3(0.75f, 0.75f, 0.01f));
|
||||||
|
symbol_->scale_.y = 1.5f;
|
||||||
}
|
}
|
||||||
|
|
||||||
void GenericStreamSource::setDescription(const std::string &desc)
|
void GenericStreamSource::setDescription(const std::string &desc)
|
||||||
|
|||||||
Reference in New Issue
Block a user