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

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

Browse Source
This commit is contained in:
Пелипенко Иван
2019-10-08 11:47:44 +00:00
parent c0c11def52
commit 1305a25427
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
qglview/gltypes.cpp
View File

@@ -89,6 +89,10 @@ void glDrawQuad(QOpenGLShaderProgram * prog, QVector4D * corner_dirs, GLfloat x,
glFuncs->glEnableVertexAttribArray(locc);
glFuncs->glVertexAttribPointer(locc, 3, GL_FLOAT, 0, 0, vcs);
glFuncs->glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
glFuncs->glDisableVertexAttribArray(loc);
glFuncs->glDisableVertexAttribArray(locv);
glFuncs->glDisableVertexAttribArray(loct);
glFuncs->glDisableVertexAttribArray(locc);
} else {
glBegin(GL_TRIANGLE_STRIP);
glColor4f(1.f, 1.f, 1.f, 1.f);

4
qglview/qglview.cpp
View File

@@ -604,8 +604,8 @@ void QGLView::checkCaps() {
void QGLView::reloadThisShaders() {
if (!shaders_supported) return;
loadShaders(shader_select, "selection", "shaders");
loadShaders(shader_halo, "selection_halo", "shaders");
loadShaders(shader_select, "selection", ":/shaders");
loadShaders(shader_halo, "selection_halo", ":/shaders");
//loadShaders(shader_rope, "rope", "://shaders");
}

2
qglview/renderer_deferred_shading.cpp
View File

@@ -545,7 +545,7 @@ void RendererDeferredShading::reloadShaders() {
for (int i = 0; i < shaders.size(); ++i) {
QOpenGLShaderProgram * p(*(shaders[i].second));
if (!p) p = new QOpenGLShaderProgram(view.context());
loadShaders(p, shaders[i].first, "shaders");
loadShaders(p, shaders[i].first, ":/shaders");
*(shaders[i].second) = p;
}
}