Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-23 05:46:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

moving forward with the void* hack for gpu::Texture

Browse source
This commit is contained in:
Sam Cake 2015-05-15 15:26:40 -07:00
parent 97b18fcd52
commit 07fe43e175
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libraries/render-utils/src/TextureCache.cpp
View file

@ -484,6 +484,7 @@ void ImageReader::run() {
int opaquePixels = 0; int opaquePixels = 0;
int translucentPixels = 0; int translucentPixels = 0;
bool isTransparent = false;
int redTotal = 0, greenTotal = 0, blueTotal = 0, alphaTotal = 0; int redTotal = 0, greenTotal = 0, blueTotal = 0, alphaTotal = 0;
const int EIGHT_BIT_MAXIMUM = 255; const int EIGHT_BIT_MAXIMUM = 255;
QColor averageColor(EIGHT_BIT_MAXIMUM, EIGHT_BIT_MAXIMUM, EIGHT_BIT_MAXIMUM); QColor averageColor(EIGHT_BIT_MAXIMUM, EIGHT_BIT_MAXIMUM, EIGHT_BIT_MAXIMUM);
@ -535,6 +536,8 @@ void ImageReader::run() {
averageColor = QColor(redTotal / imageArea, averageColor = QColor(redTotal / imageArea,
greenTotal / imageArea, blueTotal / imageArea, alphaTotal / imageArea); greenTotal / imageArea, blueTotal / imageArea, alphaTotal / imageArea);
isTransparent = (translucentPixels >= imageArea / 2);
} }
gpu::Texture* theTexture = nullptr; gpu::Texture* theTexture = nullptr;
@ -703,14 +706,11 @@ void ImageReader::run() {
QMetaObject::invokeMethod(texture.data(), "setImage", QMetaObject::invokeMethod(texture.data(), "setImage",
Q_ARG(const QImage&, image), Q_ARG(const QImage&, image),
Q_ARG(void*, theTexture), Q_ARG(void*, theTexture),
Q_ARG(bool, translucentPixels >= imageArea / 2), Q_ARG(const QColor&, averageColor), Q_ARG(bool, isTransparent),
Q_ARG(const QColor&, averageColor),
Q_ARG(int, originalWidth), Q_ARG(int, originalHeight)); Q_ARG(int, originalWidth), Q_ARG(int, originalHeight));
/* QMetaObject::invokeMethod(texture.data(), "setImage", Q_ARG(const QImage&, image), Q_ARG(bool, false),
Q_ARG(const QColor&, averageColor), Q_ARG(int, originalWidth), Q_ARG(int, originalHeight));
return;
*/
} }
void NetworkTexture::setImage(const QImage& image, void* voidTexture, bool translucent, const QColor& averageColor, int originalWidth, void NetworkTexture::setImage(const QImage& image, void* voidTexture, bool translucent, const QColor& averageColor, int originalWidth,

3
libraries/render-utils/src/TextureCache.h
View file

@ -149,8 +149,6 @@ private:
/// A texture loaded from the network. /// A texture loaded from the network.
Q_DECLARE_METATYPE(gpu::Texture);
class NetworkTexture : public Resource, public Texture { class NetworkTexture : public Resource, public Texture {
Q_OBJECT Q_OBJECT
@ -175,6 +173,7 @@ protected:
virtual void downloadFinished(QNetworkReply* reply); virtual void downloadFinished(QNetworkReply* reply);
Q_INVOKABLE void loadContent(const QByteArray& content); Q_INVOKABLE void loadContent(const QByteArray& content);
// FIXME: This void* should be a gpu::Texture* but i cannot get it to work for now, moving on...
Q_INVOKABLE void setImage(const QImage& image, void* texture, bool translucent, const QColor& averageColor, int originalWidth, Q_INVOKABLE void setImage(const QImage& image, void* texture, bool translucent, const QColor& averageColor, int originalWidth,
int originalHeight); int originalHeight);