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

GUI Selection of rendering resolution for session and settings.

Browse Source
This commit is contained in:
brunoherbelin
2020-05-12 00:29:08 +02:00
parent 32030e66dc
commit 6196f7f69e
8 changed files with 34 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
View.cpp
View File

@@ -181,21 +181,8 @@ uint MixingView::textureMixingQuadratic()
RenderView::RenderView() : View(RENDERING), frame_buffer_(nullptr)
{
// application default
glm::vec3 default_resolution(1280.f, 720.f, 0.f);
// read default settings
if ( Settings::application.views[View::RENDERING].name.empty() ) {
// no settings found: store application default
Settings::application.views[View::RENDERING].name = "Render";
// store default setting
Settings::application.views[View::RENDERING].default_scale = default_resolution;
}
else
default_resolution = Settings::application.views[View::RENDERING].default_scale;
// set resolution to settings or default
setResolution( default_resolution );
setResolution();
}
RenderView::~RenderView()
@@ -208,7 +195,7 @@ RenderView::~RenderView()
void RenderView::setResolution(glm::vec3 resolution)
{
if (resolution.x < 100.f || resolution.y < 100)
resolution = Settings::application.views[View::RENDERING].default_scale;
resolution = FrameBuffer::getResolutionFromParameters(Settings::application.framebuffer_ar, Settings::application.framebuffer_h);
if (frame_buffer_)
delete frame_buffer_;
@@ -216,14 +203,6 @@ void RenderView::setResolution(glm::vec3 resolution)
frame_buffer_ = new FrameBuffer(resolution);
}
//void RenderView::setResolution(glm::vec3 resolution)
//{
// if (frame_buffer_)
// delete frame_buffer_;
// frame_buffer_ = new FrameBuffer(resolution);
//}
void RenderView::draw()
{
static glm::mat4 projection = glm::ortho(-1.f, 1.f, -1.f, 1.f, SCENE_DEPTH, 0.f);