SHS/libs
Archived
3
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Пелипенко Иван
2015-11-16 18:20:13 +00:00
parent c27e345c51
commit ddcd5c716a
18 changed files with 389 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
qglview/renderer_simple.cpp
View File

@@ -28,10 +28,14 @@ RendererSimple::RendererSimple(QGLView * view_): GLRendererBase(view_), fbo(2)
void RendererSimple::reloadShaders() {
if (shader_fxaa == 0) shader_fxaa = new QGLShaderProgram(view.context());
loadShaders(shader_fxaa, "FXAA", "shaders");
if (shader == 0) shader = new QGLShaderProgram(view.context()); /// WARNING
loadShaders(shader, "test", "shaders"); /// WARNING
if (shader_fxaa == 0) {
shader_fxaa = new QGLShaderProgram(view.context());
loadShaders(shader_fxaa, "FXAA", "shaders");
}
/*if (shader == 0) {
shader = new QGLShaderProgram(view.context()); /// WARNING
loadShaders(shader, "test", "shaders"); /// WARNING
}*/
}
@@ -73,9 +77,9 @@ void RendererSimple::renderScene() {
fbo_c.bind();
glClearFramebuffer();
shader->bind(); /// WARNING
//shader->bind(); /// WARNING
renderObjects(GLObjectBase::Solid, l, 0, true, view.isLightEnabled(), view.isFogEnabled());
shader->release(); /// WARNING
//shader->release(); /// WARNING
if (QRect(QPoint(), fbo_c.size()).contains(mpos)) {
//qDebug() << mpos;
GLfloat data[4] = {0, 0, 0, 0};