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

Cleanup Scene and Primitives. Add comments.

Browse Source
This commit is contained in:
brunoherbelin
2020-04-13 15:17:10 +02:00
parent 7be79a9c96
commit ccd5d182ca
9 changed files with 120 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Primitives.cpp
View File

@@ -98,9 +98,9 @@ void ImageSurface::accept(Visitor& v)
v.visit(*this);
}
MediaSurface::MediaSurface(const std::string& path) : ImageSurface()
MediaSurface::MediaSurface(const std::string& uri) : ImageSurface()
{
resource_ = path;
resource_ = uri;
mediaplayer_ = new MediaPlayer;
}
@@ -140,12 +140,12 @@ void MediaSurface::update( float dt )
if ( mediaplayer_->isOpen() ) {
mediaplayer_->update();
if (parent_ != nullptr) {
parent_->transform_ = parent_->transform_ * glm::scale(glm::identity<glm::mat4>(), glm::vec3(mediaplayer_->aspectRatio(), 1.f, 1.f));
scale_.x = 1.0;
}
else
scale_.x = mediaplayer_->aspectRatio();
// if (parent_ != nullptr) {
// parent_->transform_ = parent_->transform_ * glm::scale(glm::identity<glm::mat4>(), glm::vec3(mediaplayer_->aspectRatio(), 1.f, 1.f));
// scale_.x = 1.0;
// }
// else
scale_.x = mediaplayer_->aspectRatio();
}
Primitive::update( dt );