git-svn-id: svn://db.shs.com.ru/libs@593 a8b55f48-bf90-11e4-a774-851b48703e85

This commit is contained in:
2019-09-18 13:59:18 +00:00
parent b103b76f2d
commit 3766876655
6 changed files with 34 additions and 63 deletions

View File

@@ -63,37 +63,19 @@ void RendererSimple::renderScene() {
for (int l = 0; l < passes; ++l) {
if (passes > 1) fbo.setWriteBuffer(1);
if (l == 0) {
glClearFramebuffer(view.backColor());
glEnableDepth();
glClearFramebuffer(view.backColor());
} else {
glClearFramebuffer(Qt::black, false);
glEnable(GL_DEPTH_TEST);
glDepthMask(GL_FALSE);
glDepthFunc(GL_EQUAL);
glClearFramebuffer(Qt::black, false);
}
//view.camera().apply(view.aspect);
rp.cam_offset_matrix = view.camera()->offsetMatrix();
rp.prepare();
setupLights(l, 8);
/*fbo_c.bind();
glClearFramebuffer();
//shader->bind(); /// WARNING
renderObjects(GLObjectBase::Solid, l, 0, true, view.isLightEnabled(), view.isFogEnabled());
//shader->release(); /// WARNING
if (QRect(QPoint(), fbo_c.size()).contains(mpos)) {
//qDebug() << mpos;
GLfloat data[4] = {0, 0, 0, 0};
glReadPixels(mpos.x(), fbo_c.height() - mpos.y(), 1, 1, GL_RGBA, GL_FLOAT, data);
//qDebug() << QVector3D(data[0], data[1], data[2]);
}
fbo_c.release();*/
//qDebug() << rp.viewproj_matrix << (getGLMatrix(GL_PROJECTION_MATRIX)*getGLMatrix(GL_MODELVIEW_MATRIX));
renderObjects(GLObjectBase::Solid, l, nullptr, true, view.isLightEnabled(), view.isFogEnabled());
//renderObjects(GLObjectBase::Solid, l, 0, true, true, view.isFogEnabled());
renderObjects(GLObjectBase::Transparent, l, nullptr, true, true, view.isFogEnabled());
if (passes > 1) {
glSetLightEnabled(false);
@@ -108,7 +90,6 @@ void RendererSimple::renderScene() {
}
if (view.isFeatureEnabled(QGLView::qglFXAA) || passes > 1) {
fbo.release();
//glClearFramebuffer();
glActiveTexture(GL_TEXTURE0);
glBindTexture(GL_TEXTURE_2D, fbo.colorTexture());
glSetLightEnabled(false);