From bd7b17a7878368dcdab23bb3b91c9289f8681a57 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Fri, 11 Jul 2014 10:50:11 -0700
Subject: [PATCH] Added subimage to Billboards overlays

---
 .../src/ui/overlays/BillboardOverlay.cpp      | 51 ++++++++++++++++---
 interface/src/ui/overlays/BillboardOverlay.h  |  5 +-
 2 files changed, 47 insertions(+), 9 deletions(-)

diff --git a/interface/src/ui/overlays/BillboardOverlay.cpp b/interface/src/ui/overlays/BillboardOverlay.cpp
index 8742f19c3d..d88ee6abd2 100644
--- a/interface/src/ui/overlays/BillboardOverlay.cpp
+++ b/interface/src/ui/overlays/BillboardOverlay.cpp
@@ -14,7 +14,8 @@
 #include "BillboardOverlay.h"
 
 BillboardOverlay::BillboardOverlay()
-: _scale(1.0f),
+: _fromImage(-1,-1,-1,-1),
+  _scale(1.0f),
   _isFacingAvatar(true) {
 }
 
@@ -28,6 +29,9 @@ void BillboardOverlay::render() {
             image = image.convertToFormat(QImage::Format_ARGB32);
         }
         _size = image.size();
+        if (_fromImage.x() == -1) {
+            _fromImage.setRect(0, 0, _size.width(), _size.height());
+        }
         _billboardTexture.reset(new Texture());
         glBindTexture(GL_TEXTURE_2D, _billboardTexture->getID());
         glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, _size.width(), _size.height(), 0,
@@ -58,19 +62,23 @@ void BillboardOverlay::render() {
         }
         glScalef(_scale, _scale, _scale);
         
-        float maxSize = glm::max(_size.width(), _size.height());
-        float x = _size.width() / (2.0f * maxSize);
-        float y = -_size.height() / (2.0f * maxSize);
+        float maxSize = glm::max(_fromImage.width(), _fromImage.height());
+        float x = _fromImage.width() / (2.0f * maxSize);
+        float y = -_fromImage.height() / (2.0f * maxSize);
         
         glColor3f(1.0f, 1.0f, 1.0f);
         glBegin(GL_QUADS); {
-            glTexCoord2f(0.0f, 0.0f);
+            glTexCoord2f((float)_fromImage.x() / (float)_size.width(),
+                         (float)_fromImage.y() / (float)_size.height());
             glVertex2f(-x, -y);
-            glTexCoord2f(1.0f, 0.0f);
+            glTexCoord2f(((float)_fromImage.x() + (float)_fromImage.width()) / (float)_size.width(),
+                         (float)_fromImage.y() / (float)_size.height());
             glVertex2f(x, -y);
-            glTexCoord2f(1.0f, 1.0f);
+            glTexCoord2f(((float)_fromImage.x() + (float)_fromImage.width()) / (float)_size.width(),
+                         ((float)_fromImage.y() + (float)_fromImage.height()) / _size.height());
             glVertex2f(x, y);
-            glTexCoord2f(0.0f, 1.0f);
+            glTexCoord2f((float)_fromImage.x() / (float)_size.width(),
+                         ((float)_fromImage.y() + (float)_fromImage.height()) / (float)_size.height());
             glVertex2f(-x, y);
         } glEnd();
         
@@ -93,6 +101,33 @@ void BillboardOverlay::setProperties(const QScriptValue &properties) {
         setBillboardURL(_url);
     }
     
+    QScriptValue subImageBounds = properties.property("subImage");
+    if (subImageBounds.isValid()) {
+        QRect oldSubImageRect = _fromImage;
+        QRect subImageRect = _fromImage;
+        if (subImageBounds.property("x").isValid()) {
+            subImageRect.setX(subImageBounds.property("x").toVariant().toInt());
+        } else {
+            subImageRect.setX(oldSubImageRect.x());
+        }
+        if (subImageBounds.property("y").isValid()) {
+            subImageRect.setY(subImageBounds.property("y").toVariant().toInt());
+        } else {
+            subImageRect.setY(oldSubImageRect.y());
+        }
+        if (subImageBounds.property("width").isValid()) {
+            subImageRect.setWidth(subImageBounds.property("width").toVariant().toInt());
+        } else {
+            subImageRect.setWidth(oldSubImageRect.width());
+        }
+        if (subImageBounds.property("height").isValid()) {
+            subImageRect.setHeight(subImageBounds.property("height").toVariant().toInt());
+        } else {
+            subImageRect.setHeight(oldSubImageRect.height());
+        }
+        setClipFromSource(subImageRect);
+    }
+    
     QScriptValue scaleValue = properties.property("scale");
     if (scaleValue.isValid()) {
         _scale = scaleValue.toVariant().toFloat();
diff --git a/interface/src/ui/overlays/BillboardOverlay.h b/interface/src/ui/overlays/BillboardOverlay.h
index 0037d1a4f7..5efb5767c6 100644
--- a/interface/src/ui/overlays/BillboardOverlay.h
+++ b/interface/src/ui/overlays/BillboardOverlay.h
@@ -25,7 +25,8 @@ public:
     
     virtual void render();
     virtual void setProperties(const QScriptValue& properties);
-
+    void setClipFromSource(const QRect& bounds) { _fromImage = bounds; }
+    
 private slots:
     void replyFinished();
 
@@ -37,6 +38,8 @@ private:
     QSize _size;
     QScopedPointer<Texture> _billboardTexture;
     
+    QRect _fromImage; // where from in the image to sample
+    
     glm::quat _rotation;
     float _scale;
     bool _isFacingAvatar;