SHS/qglengine
4
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

small refactoring

Browse Source
This commit is contained in:
Бычков Андрей
2021-05-31 12:47:46 +03:00
parent 5eaa20202b
commit a9f7408e71
44 changed files with 86 additions and 595 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
renderer_selection.cpp
View File

@@ -26,8 +26,8 @@
using namespace QGLEngineShaders;
RendererSelection::RendererSelection(Renderer * r_): r(r_),
fbo_selection(r->view, 6) {
RendererSelection::RendererSelection(Renderer * r_)
: r(r_), fbo_selection(r->view, 6) {
sel_frame = Primitive::plane(2., 2.);
id_hover = 0;
line_thick_ = 2.;
@@ -50,8 +50,6 @@ void RendererSelection::resize(int width, int height) {
scale_ = 0.5 / appScale();
fbo_selection.enablePixelBuffer();
fbo_selection.resize(width * scale_, height * scale_);
//fbo_selection.setColorTextureFiltering(sbrSrcHover , GL_LINEAR);
//fbo_selection.setColorTextureFiltering(sbrSrcSelect, GL_LINEAR);
}
@@ -138,8 +136,6 @@ void RendererSelection::renderSelection(Scene & scene) {
rs.drawLights();
rs.drawCameras();
rs.drawCurrentHandleObjects();
//mouse_rect = fbo_selection.rect();
if (r->mouse_rect.isNull())
fbo_selection.queryPoint(0, r->mouse_pos * scale_);
else
@@ -150,14 +146,14 @@ void RendererSelection::renderSelection(Scene & scene) {
fbo_selection.bindColorTexture(sbrSrcHover , sbrSrcHover );
fbo_selection.bindColorTexture(sbrSrcSelect, sbrSrcSelect);
fbo_selection.setWriteBuffers(QVector<int>() << sbrHovered << sbrSelected);
if (!view->hoverHalo_ && !view->selectionHalo_)
if (!view->isHoverHaloEnabled() && !view->isSelectionHaloEnabled())
glClearFramebuffer(QColor(0,0,0,0), false);
else {
r->bindShader(Renderer::srSelectionHalo, &prog);
r->setUniformHalo(prog, "hover" , view->hoverHaloColor() , view->hoverHaloFillAlpha());
r->setUniformHalo(prog, "selection", view->selectionHaloColor(), view->selectionHaloFillAlpha());
prog->setUniformValue("has_hover" , view->hoverHalo_ && (id_hover > 0) ? 1.f : 0.f);
prog->setUniformValue("has_selection", view->selectionHalo_ ? 1.f : 0.f);
prog->setUniformValue("has_hover" , view->isHoverHaloEnabled() && (id_hover > 0) ? 1.f : 0.f);
prog->setUniformValue("has_selection", view->isSelectionHaloEnabled() ? 1.f : 0.f);
prog->setUniformValue("fb_hover" , (int)sbrSrcHover);
prog->setUniformValue("fb_selection", (int)sbrSrcSelect);
prog->setUniformValue("hover_id", QVector4D(float( id_hover & 0xFF) / 255.f,
@@ -177,7 +173,6 @@ void RendererSelection::renderSelection(Scene & scene) {
fbo_selection.setWriteBuffer(sbrSelectedFXAA);
r->renderQuad(prog, r->quad, 0, false);
}
fbo_selection.release();
}
}