git-svn-id: svn://db.shs.com.ru/libs@72 a8b55f48-bf90-11e4-a774-851b48703e85
This commit is contained in:
@@ -40,6 +40,7 @@ fbo_g(5, true, GL_RGBA16F), fbo_out(3, false, GL_RGBA16F), fbo_hsmall(1, false,
|
||||
for (int i = 0; i < shaders.size(); ++i)
|
||||
*(shaders[i].second) = 0;
|
||||
lights_per_pass = 8;
|
||||
tnoise = 0;
|
||||
exposure_ = 1.;
|
||||
df = new QWidget();
|
||||
df->setLayout(new QBoxLayout(QBoxLayout::TopToBottom));
|
||||
@@ -231,7 +232,21 @@ void RendererDeferredShading::renderScene() {
|
||||
//qDebug() << wi << ri << lms;
|
||||
/*wi = lri;
|
||||
ri = 1 - lms;*/
|
||||
|
||||
glEnable(GL_TEXTURE_1D);
|
||||
if (tnoise == 0) {
|
||||
glGenTextures(1, &tnoise);
|
||||
glBindTexture(GL_TEXTURE_1D, tnoise);
|
||||
QByteArray ba;
|
||||
for (int i = 0; i < 32*3; ++i)
|
||||
ba.push_back(char(random() % 256));
|
||||
//qDebug() << ba;
|
||||
glTexImage1D(GL_TEXTURE_1D, 0, GL_RGB8, 32, 0, GL_RGB, GL_UNSIGNED_BYTE, ba.constData());
|
||||
glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
|
||||
glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
|
||||
glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE);
|
||||
glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
|
||||
glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
|
||||
}
|
||||
glBindTexture(GL_TEXTURE_2D, fbo_out.colorTexture(lri));
|
||||
glActiveTextureChannel(1);
|
||||
glBindTexture(GL_TEXTURE_2D, fbo_out.colorTexture(2));
|
||||
@@ -239,16 +254,20 @@ void RendererDeferredShading::renderScene() {
|
||||
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
|
||||
glActiveTextureChannel(2);
|
||||
glBindTexture(GL_TEXTURE_2D, fbo_g.colorTexture(1));
|
||||
glActiveTextureChannel(3);
|
||||
glBindTexture(GL_TEXTURE_1D, tnoise);
|
||||
shader_ssao_merge->bind();
|
||||
shader_ssao_merge->setUniformValue("qgl_ModelViewProjectionMatrix", QMatrix4x4());
|
||||
shader_ssao_merge->setUniformValue("z_far", GLfloat(view.depthEnd()));
|
||||
shader_ssao_merge->setUniformValue("z_near", GLfloat(view.depthStart()));
|
||||
shader_ssao_merge->setUniformValue("mat_proj", mproj);
|
||||
shader_ssao_merge->setUniformValue("n0", 3);
|
||||
shader_ssao_merge->setUniformValue("t0", 0);
|
||||
shader_ssao_merge->setUniformValue("ts", 1);
|
||||
shader_ssao_merge->setUniformValue("tg1", 2);
|
||||
fbo_out.setWriteBuffer(lwi);
|
||||
glDrawQuad(shader_ssao_merge, corner_dirs);
|
||||
glDisable(GL_TEXTURE_1D);
|
||||
wi = lri;
|
||||
ri = lwi;
|
||||
//piSwap<int>(wi, ri);
|
||||
|
||||
Reference in New Issue
Block a user