diff --git a/qglengine/core/glcubemap.cpp b/qglengine/core/glcubemap.cpp index 49bfee3..2f7570e 100644 --- a/qglengine/core/glcubemap.cpp +++ b/qglengine/core/glcubemap.cpp @@ -234,6 +234,13 @@ void CubeTexture::load() { QSize sz; QVector data = loadFileHDR(hdr_path, &sz); loadHDR(data, sz); + } else { + destroy(); + bind(); + for (int i = 0; i < 6; ++i) { + f->glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X + i, 0, format_, 1, 1, 0, GL_RGB, GL_FLOAT, 0); + } + f->glGenerateMipmap(GL_TEXTURE_CUBE_MAP); } changed_ = false; } diff --git a/qglengine/qglview.h b/qglengine/qglview.h index 8f5f014..d2d04af 100644 --- a/qglengine/qglview.h +++ b/qglengine/qglview.h @@ -246,7 +246,7 @@ public slots: void setGamma(const float & arg) {renderer_.gamma_ = arg;} void setAutoExposure(bool arg) {renderer_.tone_proc.enabled = arg;} void setAmbientColor(const QColor & arg) {ambientColor_ = arg;} - void setEnvironmentMapFile(QString file) {renderer_.tex_env.setFileHDR(file);} + void setEnvironmentMapFile(QString file) {renderer_.tex_env.setFileHDR(file); renderer_.recreateMaterialThumbnails(true);} void setFogColor(const QColor & arg) {fogColor_ = arg;} void setFogDensity(const float & arg) {fogDensity_ = arg;} void setFogDecay(const float & arg) {fogDecay_ = arg;} diff --git a/qglengine/widgets/view_editor.ui b/qglengine/widgets/view_editor.ui index 2ff5423..a65a52d 100644 --- a/qglengine/widgets/view_editor.ui +++ b/qglengine/widgets/view_editor.ui @@ -196,6 +196,9 @@ Qt::Horizontal + + QSizePolicy::Preferred + 40