ModelOverlay functionnal + bounding box

interface/src/ui/overlays/ModelOverlay.cpp

@@ -0,0 +1,115 @@
+//
+//  ModelOverlay.cpp
+//
+//
+//  Created by Clement on 6/30/14.
+//  Copyright 2014 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+#include "../../Menu.h"
+
+#include "ModelOverlay.h"
+
+ModelOverlay::ModelOverlay()
+    : _model(),
+      _scale(1.0f),
+      _updateModel(false) {
+    _model.init();
+}
+
+void ModelOverlay::update(float deltatime) {
+    if (_updateModel) {
+        _updateModel = false;
+        
+        _model.setScaleToFit(true, _scale);
+        _model.setSnapModelToCenter(true);
+        _model.setRotation(_rotation);
+        _model.setTranslation(_position);
+        _model.setURL(_url);
+        _model.simulate(deltatime, true);
+    } else {
+        _model.simulate(deltatime);
+    }
+}
+
+void ModelOverlay::render() {
+    if (_model.isActive()) {
+        
+        if (_model.isRenderable()) {
+            _model.render(_alpha);
+        }
+        bool displayModelBounds = Menu::getInstance()->isOptionChecked(MenuOption::DisplayModelBounds);
+        if (displayModelBounds) {
+            glm::vec3 unRotatedMinimum = _model.getUnscaledMeshExtents().minimum;
+            glm::vec3 unRotatedMaximum = _model.getUnscaledMeshExtents().maximum;
+            glm::vec3 unRotatedExtents = unRotatedMaximum - unRotatedMinimum;
+            
+            float width = unRotatedExtents.x;
+            float height = unRotatedExtents.y;
+            float depth = unRotatedExtents.z;
+            
+            Extents rotatedExtents = _model.getUnscaledMeshExtents();
+            calculateRotatedExtents(rotatedExtents, _rotation);
+            
+            glm::vec3 rotatedSize = rotatedExtents.maximum - rotatedExtents.minimum;
+            
+            const glm::vec3& modelScale = _model.getScale();
+            
+            glPushMatrix(); {
+                glTranslatef(_position.x, _position.y, _position.z);
+                
+                // draw the rotated bounding cube
+                glColor4f(0.0f, 0.0f, 1.0f, 1.0f);
+                glPushMatrix(); {
+                    glScalef(rotatedSize.x * modelScale.x, rotatedSize.y * modelScale.y, rotatedSize.z * modelScale.z);
+                    glutWireCube(1.0);
+                } glPopMatrix();
+                
+                // draw the model relative bounding box
+                glm::vec3 axis = glm::axis(_rotation);
+                glRotatef(glm::degrees(glm::angle(_rotation)), axis.x, axis.y, axis.z);
+                glScalef(width * modelScale.x, height * modelScale.y, depth * modelScale.z);
+                glColor3f(0.0f, 1.0f, 0.0f);
+                glutWireCube(1.0);
+                
+            } glPopMatrix();
+        }
+    }
+}
+
+void ModelOverlay::setProperties(const QScriptValue &properties) {
+    Base3DOverlay::setProperties(properties);
+    
+    QScriptValue urlValue = properties.property("url");
+    if (urlValue.isValid()) {
+        _url = urlValue.toVariant().toString();
+        _updateModel = true;
+    }
+    
+    QScriptValue scaleValue = properties.property("scale");
+    if (scaleValue.isValid()) {
+        _scale = scaleValue.toVariant().toFloat();
+        _updateModel = true;
+    }
+    
+    QScriptValue rotationValue = properties.property("rotation");
+    if (rotationValue.isValid()) {
+        QScriptValue x = rotationValue.property("x");
+        QScriptValue y = rotationValue.property("y");
+        QScriptValue z = rotationValue.property("z");
+        QScriptValue w = rotationValue.property("w");
+        if (x.isValid() && y.isValid() && z.isValid() && w.isValid()) {
+            _rotation.x = x.toVariant().toFloat();
+            _rotation.y = y.toVariant().toFloat();
+            _rotation.z = z.toVariant().toFloat();
+            _rotation.w = w.toVariant().toFloat();
+        }
+        _updateModel = true;
+    }
+    
+    if (properties.property("position").isValid()) {
+        _updateModel = true;
+    }
+}

interface/src/ui/overlays/ModelOverlay.h

@@ -0,0 +1,38 @@
+//
+//  ModelOverlay.h
+//
+//
+//  Created by Clement on 6/30/14.
+//  Copyright 2014 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#ifndef hifi_ModelOverlay_h
+#define hifi_ModelOverlay_h
+
+#include "Base3DOverlay.h"
+
+#include "../../renderer/Model.h"
+
+class ModelOverlay : public Base3DOverlay {
+    Q_OBJECT
+public:
+    ModelOverlay();
+    
+    virtual void update(float deltatime);
+    virtual void render();
+    virtual void setProperties(const QScriptValue& properties);
+private:
+    
+    Model _model;
+    
+    QUrl _url;
+    glm::quat _rotation;
+    float _scale;
+    
+    bool _updateModel;
+};
+
+#endif // hifi_ModelOverlay_h

interface/src/ui/overlays/Overlays.cpp

@@ -17,6 +17,7 @@
 #include "Sphere3DOverlay.h"
 #include "TextOverlay.h"
 #include "LocalVoxelsOverlay.h"
+#include "ModelOverlay.h"
 
 Overlays::Overlays() : _nextOverlayID(1) {
 }
@@ -156,6 +157,12 @@ unsigned int Overlays::addOverlay(const QString& type, const QScriptValue& prope
         thisOverlay->setProperties(properties);
         created = true;
         is3D = true;
+    } else if (type == "model") {
+        thisOverlay = new ModelOverlay();
+        thisOverlay->init(_parent);
+        thisOverlay->setProperties(properties);
+        created = true;
+        is3D = true;
     }
 
     if (created) {