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

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

Browse Source
This commit is contained in:
Пелипенко Иван
2019-10-08 12:26:48 +00:00
parent 1305a25427
commit 511a7c0514
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
qglview/gltypes.cpp
View File

@@ -164,7 +164,7 @@ void createGLTexture(GLuint & tex, const QImage & image, const GLenum & format,
glGenTextures(1, &tex); glGenTextures(1, &tex);
} }
glBindTexture(target, tex); glBindTexture(target, tex);
QImage im = image.mirrored(false, true);///__GLWidget__::convertToGLFormat(image); QImage im = image.convertToFormat(QImage::Format_ARGB32).mirrored(false, true);///__GLWidget__::convertToGLFormat(image);
//const QImage & cim(im); //const QImage & cim(im);
//glClearError(); //glClearError();
//glPixelStorei(GL_UNPACK_ALIGNMENT, 1); //glPixelStorei(GL_UNPACK_ALIGNMENT, 1);

4
qglview/qglview.cpp
View File

@@ -604,8 +604,8 @@ void QGLView::checkCaps() {
void QGLView::reloadThisShaders() { void QGLView::reloadThisShaders() {
if (!shaders_supported) return; if (!shaders_supported) return;
loadShaders(shader_select, "selection", ":/shaders"); loadShaders(shader_select, "selection", "://shaders");
loadShaders(shader_halo, "selection_halo", ":/shaders"); loadShaders(shader_halo, "selection_halo", "://shaders");
//loadShaders(shader_rope, "rope", "://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) { for (int i = 0; i < shaders.size(); ++i) {
QOpenGLShaderProgram * p(*(shaders[i].second)); QOpenGLShaderProgram * p(*(shaders[i].second));
if (!p) p = new QOpenGLShaderProgram(view.context()); if (!p) p = new QOpenGLShaderProgram(view.context());
loadShaders(p, shaders[i].first, ":/shaders"); loadShaders(p, shaders[i].first, "://shaders");
*(shaders[i].second) = p; *(shaders[i].second) = p;
} }
} }