Get rid of unused, expensive "average color" nonsense.

Andrzej Kapolka committed 12 years ago

Commit bc3bba91 parent 35d0fa76 files · +5 −52Browse files

Showing the changes to interface/src/renderer/TextureCache.cpp (1 of 6 files). Show all

Unified · Split

interface/src/renderer/TextureCache.cpp+4−13

 NetworkTexture::NetworkTexture(const QUrl& url, bool normalMap) :
     Resource(url),
-    _averageColor(1.0f, 1.0f, 1.0f, 1.0f),
     _translucent(false) {
     if (!url.isValid()) {
         image = image.convertToFormat(QImage::Format_ARGB32);
     }
-    // sum up the colors for the average and check for translucency
+    // check for translucency
-    glm::vec4 accumulated;
     int translucentPixels = 0;
     const int EIGHT_BIT_MAXIMUM = 255;
+    const int RGB_BITS = 24;
     for (int y = 0; y < image.height(); y++) {
         for (int x = 0; x < image.width(); x++) {
-            QRgb pixel = image.pixel(x, y);
+            int alpha = image.pixel(x, y) >> RGB_BITS;
-            accumulated.r += qRed(pixel);
-            accumulated.g += qGreen(pixel);
-            accumulated.b += qBlue(pixel);
-            int alpha = qAlpha(pixel);
             if (alpha != 0 && alpha != EIGHT_BIT_MAXIMUM) {
                 translucentPixels++;
             }
-            accumulated.a += alpha;
         }
     }
     int imageArea = image.width() * image.height();
     QMetaObject::invokeMethod(texture.data(), "setImage", Q_ARG(const QImage&, image),
-        Q_ARG(const glm::vec4&, accumulated / (float) (imageArea * EIGHT_BIT_MAXIMUM)),
         Q_ARG(bool, translucentPixels >= imageArea / 2));
     _reply->deleteLater();
 }
     QThreadPool::globalInstance()->start(new ImageReader(_self, reply));
 }
-void NetworkTexture::setImage(const QImage& image, const glm::vec4& averageColor, bool translucent) {
+void NetworkTexture::setImage(const QImage& image, bool translucent) {
-    _averageColor = averageColor;
     _translucent = translucent;
     finishedLoading(true);