diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2015-01-30 11:28:20 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2015-02-08 15:02:28 +0000 |
| commit | 4b22aa1904337e595cca0b6f46b445d555db7d6b (patch) | |
| tree | a8c9f26628c41dae1ae48ba6853b07d50f96a3f8 /src/quick3d/quick3drenderer | |
| parent | 782907f3f15def5f050bb69f95575d5e3f40b61d (diff) | |
Texture API refactoring
* Added LoadTextureDataJob
* QAbstractTextureProvider: maximum layers property
* Automatic QAbstractTextureProvider::TextureFormat added
* material-qml should work perfectly with that patch.
Change-Id: I3f92f13b783155798772086304a30126a4fc687d
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/quick3d/quick3drenderer')
| -rw-r--r-- | src/quick3d/quick3drenderer/items/quick3dtexture.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/quick3d/quick3drenderer/items/quick3dtexture.cpp b/src/quick3d/quick3drenderer/items/quick3dtexture.cpp index 01689b432..172da793d 100644 --- a/src/quick3d/quick3drenderer/items/quick3dtexture.cpp +++ b/src/quick3d/quick3drenderer/items/quick3dtexture.cpp @@ -211,9 +211,9 @@ void Quick3DTextureCubeMapExtension::loadFace(const QUrl &faceUrl, QAbstractText // parentTexture()->setStatus(QAbstractTextureProvider::Loading); if (img.load(source)) { - TexImageDataPtr dataPtr(new TexImageData(0, 0)); + TexImageDataPtr dataPtr(new TexImageData()); - dataPtr->setCubeFace(static_cast<QOpenGLTexture::CubeMapFace>(face)); +// dataPtr->setCubeFace(static_cast<QOpenGLTexture::CubeMapFace>(face)); if (parentTexture()->height() != img.height()) parentTexture()->setHeight(img.height()); if (parentTexture()->width() != img.width()) @@ -224,7 +224,7 @@ void Quick3DTextureCubeMapExtension::loadFace(const QUrl &faceUrl, QAbstractText if (format != parentTexture()->format()) parentTexture()->setFormat(format); dataPtr->setImage(img); - parentTexture()->addImageData(dataPtr); +// parentTexture()->addImageData(dataPtr); // parentTexture()->setStatus(QAbstractTextureProvider::Loaded); } else { |