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

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

Browse Source
This commit is contained in:
Бычков Андрей
2019-10-08 12:33:04 +00:00
parent 511a7c0514
commit c9640cf425
2 changed files with 1 additions and 2 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.convertToFormat(QImage::Format_ARGB32).mirrored(false, true);///__GLWidget__::convertToGLFormat(image); QImage im = image.mirrored(false, true).convertToFormat(QImage::Format_ARGB32, Qt::ColorOnly);
//const QImage & cim(im); //const QImage & cim(im);
//glClearError(); //glClearError();
//glPixelStorei(GL_UNPACK_ALIGNMENT, 1); //glPixelStorei(GL_UNPACK_ALIGNMENT, 1);

1
qglview/qglview.cpp
View File

@@ -803,7 +803,6 @@ QByteArray QGLView::saveCamera() {
void QGLView::restoreCamera(const QByteArray &ba) { void QGLView::restoreCamera(const QByteArray &ba) {
if (ba.isEmpty()) return; if (ba.isEmpty()) return;
qDebug() << "restoreCamera" << ba.size();
ChunkStream cs(ba); ChunkStream cs(ba);
QVector3D pos, aim, ang; QVector3D pos, aim, ang;
while (!cs.atEnd()) { while (!cs.atEnd()) {