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

code format

Browse Source
This commit is contained in:
Пелипенко Иван
2022-12-14 14:14:33 +03:00
parent 09e5342956
commit cdb02fc9be
278 changed files with 15371 additions and 12176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
libs/qglview/renderer_simple.cpp
View File

@@ -19,11 +19,13 @@
#include "renderer_simple.h"
RendererSimple::RendererSimple(QGLView * view_): GLRendererBase(view_), fbo(2)
, fbo_c(1, true, GL_RGBA32F) /// WARNING
RendererSimple::RendererSimple(QGLView * view_)
: GLRendererBase(view_)
, fbo(2)
, fbo_c(1, true, GL_RGBA32F) /// WARNING
{
shader_fxaa = 0;
shader = 0; /// WARNING
shader = 0; /// WARNING
}
@@ -33,8 +35,8 @@ void RendererSimple::reloadShaders() {
loadShaders(shader_fxaa, "FXAA", "://shaders");
}
/*if (shader == 0) {
shader = new QOpenGLShaderProgram(view.context()); /// WARNING
loadShaders(shader, "test", "shaders"); /// WARNING
shader = new QOpenGLShaderProgram(view.context()); /// WARNING
loadShaders(shader, "test", "shaders"); /// WARNING
}*/
}
@@ -48,12 +50,12 @@ void RendererSimple::resizeFBO(int w, int h) {
void RendererSimple::renderScene() {
int passes = (view.lightsCount() - 1) / 8 + 1;
//QMatrix4x4 pm = getGLMatrix(GL_PROJECTION_MATRIX), mvm = getGLMatrix(GL_MODELVIEW_MATRIX), pmvm = pm * mvm, lpm, lmvm, lpmvm;
//glSetCapEnabled(GL_MULTISAMPLE, view.isFeatureEnabled(QGLView::qglMSAA));
// QMatrix4x4 pm = getGLMatrix(GL_PROJECTION_MATRIX), mvm = getGLMatrix(GL_MODELVIEW_MATRIX), pmvm = pm * mvm, lpm, lmvm, lpmvm;
// glSetCapEnabled(GL_MULTISAMPLE, view.isFeatureEnabled(QGLView::qglMSAA));
if (passes < 1) passes = 1;
//glEnable(GL_FOG);
//if (view.isFeatureEnabled(QGLView::qglFXAA)) fbo.bind();
//glEnable(GL_TEXTURE_2D);
// glEnable(GL_FOG);
// if (view.isFeatureEnabled(QGLView::qglFXAA)) fbo.bind();
// glEnable(GL_TEXTURE_2D);
if (passes > 1 || view.isFeatureEnabled(QGLView::qglFXAA)) {
fbo.bind();
fbo.setWriteBuffer(0);
@@ -73,8 +75,8 @@ void RendererSimple::renderScene() {
glClearFramebuffer(Qt::black, false);
view.camera()->apply(view.aspect);
}
//rp.cam_offset_matrix = view.camera()->offsetMatrix();
//rp.prepare();
// rp.cam_offset_matrix = view.camera()->offsetMatrix();
// rp.prepare();
setupLights(l, 8);
renderObjects(GLObjectBase::Solid, l, nullptr, true, view.isLightEnabled(), view.isFogEnabled());
renderObjects(GLObjectBase::Transparent, l, nullptr, true, true, view.isFogEnabled());