Merge branch 'master' of https://github.com/highfidelity/hifi into bilbo

examples/overlaysExample.js

@@ -156,6 +156,13 @@ var line3d = Overlays.addOverlay("line3d", {
                     lineWidth: 5
                 });
 
+// this will display the content of your clipboard at the origin of the domain
+var clipboardPreview = Overlays.addOverlay("clipboard", {
+                                           position: { x: 0, y: 0, z: 0},
+                                           size: 1 / 32,
+                                           visible: true
+                                           });
+
 
 // When our script shuts down, we should clean up all of our overlays
 function scriptEnding() {
@@ -170,6 +177,7 @@ function scriptEnding() {
     Overlays.deleteOverlay(solidCube);
     Overlays.deleteOverlay(sphere);
     Overlays.deleteOverlay(line3d);
+    Overlays.deleteOverlay(clipboardPreview);
 }
 Script.scriptEnding.connect(scriptEnding);
 

interface/src/ui/ClipboardOverlay.cpp

@@ -0,0 +1,50 @@
+//
+//  ClipboardOverlay.cpp
+//  hifi
+//
+//  Created by Clément Brisset on 2/20/14.
+//  Copyright (c) 2014 High Fidelity, Inc. All rights reserved.
+//
+
+// include this before QGLWidget, which includes an earlier version of OpenGL
+#include "InterfaceConfig.h"
+
+#include <QGLWidget>
+#include <SharedUtil.h>
+
+#include "ClipboardOverlay.h"
+#include "../Application.h"
+
+static int lastVoxelCount = 0;
+
+ClipboardOverlay::ClipboardOverlay() {
+}
+
+ClipboardOverlay::~ClipboardOverlay() {
+}
+
+void ClipboardOverlay::render() {
+    if (!_visible) {
+        return; // do nothing if we're not visible
+    }
+    
+    VoxelSystem* voxelSystem = Application::getInstance()->getSharedVoxelSystem();
+    VoxelTree* clipboard = Application::getInstance()->getClipboard();
+    if (voxelSystem->getTree() != clipboard) {
+        voxelSystem->changeTree(clipboard);
+    }
+    
+    glPushMatrix();
+    glTranslatef(_position.x, _position.y, _position.z);
+    glScalef(_size, _size, _size);
+    
+    // We only force the redraw when the clipboard content has changed
+    if (lastVoxelCount != clipboard->getOctreeElementsCount()) {
+        voxelSystem->forceRedrawEntireTree();
+        lastVoxelCount = clipboard->getOctreeElementsCount();
+    }
+    
+    voxelSystem->render();
+    
+    glPopMatrix();
+}

interface/src/ui/ClipboardOverlay.h

@@ -0,0 +1,25 @@
+//
+//  ClipboardOverlay.h
+//  hifi
+//
+//  Created by Clément Brisset on 2/20/14.
+//  Copyright (c) 2014 High Fidelity, Inc. All rights reserved.
+//
+
+#ifndef __interface__ClipboardOverlay__
+#define __interface__ClipboardOverlay__
+
+#include "Volume3DOverlay.h"
+
+class ClipboardOverlay : public Volume3DOverlay {
+    Q_OBJECT
+    
+public:
+    ClipboardOverlay();
+    ~ClipboardOverlay();
+    
+    virtual void render();
+};
+
+
+#endif /* defined(__interface__ClipboardOverlay__) */

interface/src/ui/Overlays.cpp

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