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

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

Browse Source
This commit is contained in:
Пелипенко Иван
2017-10-03 12:20:32 +00:00
parent b46b9329f3
commit 7ad19d72c5
40 changed files with 320 additions and 712 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
qglview/renderer_deferred_shading.cpp
View File

@@ -59,7 +59,7 @@ fbo_g(5, true, GL_RGBA16F), fbo_out(3, false, GL_RGBA16F), fbo_hsmall(1, false,
RendererDeferredShading::~RendererDeferredShading() {
for (int i = 0; i < shaders.size(); ++i) {
QGLShaderProgram * p(*(shaders[i].second));
__GLShaderProgram__ * p(*(shaders[i].second));
if (p) delete p;
}
delete df;
@@ -521,6 +521,9 @@ void RendererDeferredShading::renderScene() {
void RendererDeferredShading::init(int width, int height) {
#if QT_VERSION >= 0x050600
initializeOpenGLFunctions();
#endif
resize(width, height);
}
@@ -536,8 +539,8 @@ void RendererDeferredShading::resize(int width, int height) {
void RendererDeferredShading::reloadShaders() {
for (int i = 0; i < shaders.size(); ++i) {
QGLShaderProgram * p(*(shaders[i].second));
if (!p) p = new QGLShaderProgram(view.context());
__GLShaderProgram__ * p(*(shaders[i].second));
if (!p) p = new __GLShaderProgram__(view.context());
loadShaders(p, shaders[i].first, "shaders");
*(shaders[i].second) = p;
}