Added support for OSG on Mac platform

qgroundcontrol.pri

@@ -34,9 +34,17 @@ release {
 #    DEFINES += QT_NO_WARNING_OUTPUT
 }
 
+QMAKE_PRE_LINK += echo "Copying files"
+
+#QMAKE_PRE_LINK += && cp -rf $$BASEDIR/models $$TARGETDIR/debug/.
+#QMAKE_PRE_LINK += && cp -rf $$BASEDIR/models $$TARGETDIR/release/.
+
 # MAC OS X
 macx { 
 
+    COMPILER_VERSION = $$system(gcc -v)
+    message(Using compiler $$COMPILER_VERSION)
+
     HARDWARE_PLATFORM = $$system(uname -a)
     contains( HARDWARE_PLATFORM, 9.6.0 ) || contains( HARDWARE_PLATFORM, 9.7.0 ) || contains( HARDWARE_PLATFORM, 9.8.0 ) || contains( HARDWARE_PLATFORM, 9.9.0 ) {
         # x86 Mac OS X Leopard 10.5 and earlier
@@ -55,18 +63,15 @@ macx {
         message(Building for Mac OS X 64bit/Snow Leopard 10.6 and later)
     }
 
-    QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
+    QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5
 
     DESTDIR = $$BASEDIR/bin/mac
-    INCLUDEPATH += -framework SDL \
-        $$BASEDIR/../mavlink/contrib/slugs/include \
-        $$BASEDIR/../mavlink/include
+    INCLUDEPATH += -framework SDL
 
     LIBS += -framework IOKit \
         -framework SDL \
         -framework CoreFoundation \
         -framework ApplicationServices \
- #       -framework GLUT \
         -lm
     
     ICON = $$BASEDIR/images/icons/macx.icns
@@ -74,25 +79,68 @@ macx {
     # Copy audio files if needed
     QMAKE_PRE_LINK += cp -rf $$BASEDIR/audio $$DESTDIR/qgroundcontrol.app/Contents/MacOs/.
 
-    exists(/opt/local/lib/osg):exists("/opt/local/lib/osgEarth") {
-    message("Building support for OSGEARTH")
-    DEPENDENCIES_PRESENT += osgearth
-    LIBS += -L/opt/local/lib/
-    INCLUDEPATH += /opt/local/include
-    # Include OpenSceneGraph and osgEarth libraries
-    LIBS += -losg \
-        -losgViewer \
-        -losgEarth \
-        -losgEarthUtil
+    exists(/Library/Frameworks/osg.framework):exists(/Library/Frameworks/OpenThreads.framework) {
+    # No check for GLUT.framework since it's a MAC default
+    message("Building support for OpenSceneGraph")
+    DEPENDENCIES_PRESENT += osg
     DEFINES += QGC_OSG_ENABLED
+    # Include OpenSceneGraph libraries
+    INCLUDEPATH += -framework GLUT \
+            -framework Carbon \
+            -framework OpenThreads \
+            -framework osg \
+            -framework osgViewer \
+            -framework osgGA \
+            -framework osgDB \
+            -framework osgText \
+            -framework osgWidget
+
+    LIBS += -framework GLUT \
+            -framework Carbon \
+            -framework OpenThreads \
+            -framework osg \
+            -framework osgViewer \
+            -framework osgGA \
+            -framework osgDB \
+            -framework osgText \
+            -framework osgWidget
+    }
+
+    exists(/usr/include/osgEarth) {
+    message("Building support for osgEarth")
+    DEPENDENCIES_PRESENT += osgearth
+    # Include osgEarth libraries
+    INCLUDEPATH += -framework GDAL \
+            $$IN_PWD/lib/mac32-gcc/include \
+            -framework GEOS \
+            -framework SQLite3 \
+            -framework osgFX \
+            -framework osgTerrain
+
+    LIBS += -framework GDAL \
+            -framework GEOS \
+            -framework SQLite3 \
+            -framework osgFX \
+            -framework osgTerrain \
+    DEFINES += QGC_OSGEARTH_ENABLED
+    }
+
+    exists(/opt/local/include/libfreenect) {
+    message("Building support for libfreenect")
+    DEPENDENCIES_PRESENT += libfreenect
+    # Include libfreenect libraries
+    LIBS += -lfreenect
+    DEFINES += QGC_LIBFREENECT_ENABLED
     }
+
+    # osg/osgEarth dynamic casts might fail without this compiler option.
+    # see http://osgearth.org/wiki/FAQ for details.
+    #QMAKE_CXXFLAGS += -Wl, -E
 }
 
 # GNU/Linux
 linux-g++ {
     
-    CONFIG += debug
-    
     debug {
         DESTDIR = $$BUILDDIR/debug
     }
@@ -131,21 +179,41 @@ linux-g++ {
         -lSDL \
         -lSDLmain
 
-exists(/usr/include/osgEarth) | exists(/usr/local/include/osgEarth) {
-message("Building support for OSGEARTH")
-DEPENDENCIES_PRESENT += osgearth
-# Include OpenSceneGraph and osgEarth libraries
-LIBS += -losg \
-    -losgViewer \
+    exists(/usr/include/osg) {
+    message("Building support for OpenSceneGraph")
+    DEPENDENCIES_PRESENT += osg
+    # Include OpenSceneGraph libraries
+    LIBS += -losg
+    DEFINES += QGC_OSG_ENABLED
+    }
+
+    exists(/usr/include/osgEarth) | exists(/usr/local/include/osgEarth) {
+    message("Building support for osgEarth")
+    DEPENDENCIES_PRESENT += osgearth
+    # Include osgEarth libraries
+    LIBS += -losgViewer \
             -losgEarth \
             -losgEarthUtil
-DEFINES += QGC_OSG_ENABLED
-}
+    DEFINES += QGC_OSGEARTH_ENABLED
+    }
 
-QMAKE_CXXFLAGS += -Wl,-E
+    exists(/usr/local/include/libfreenect) {
+    message("Building suplocport for libfreenect")
+    DEPENDENCIES_PRESENT += libfreenect
+    INCLUDEPATH += /usr/include/libusb-1.0
+    # Include libfreenect libraries
+    LIBS += -lfreenect
+    DEFINES += QGC_LIBFREENECT_ENABLED
+    }
 
-        #-lflite_cmu_us_rms \
-        #-lflite_cmu_us_slt \
+    QMAKE_PRE_LINK += && cp -rf $$BASEDIR/models $$TARGETDIR/debug/.
+    QMAKE_PRE_LINK += && cp -rf $$BASEDIR/models $$TARGETDIR/release/.
+    QMAKE_PRE_LINK += && cp -rf $$BASEDIR/data $$TARGETDIR/debug/.
+    QMAKE_PRE_LINK += && cp -rf $$BASEDIR/data $$TARGETDIR/release/.
+
+    # osg/osgEarth dynamic casts might fail without this compiler option.
+    # see http://osgearth.org/wiki/FAQ for details.
+    QMAKE_CXXFLAGS += -Wl, -E
 }
 
 linux-g++-64 {
@@ -188,16 +256,36 @@ linux-g++-64 {
         -lSDL \
         -lSDLmain
 
-exists(/usr/lib/osg):exists(/usr/lib/osgEarth) {
-message("Building support for OSGEARTH")
-DEPENDENCIES_PRESENT += osgearth
-# Include OpenSceneGraph and osgEarth libraries
-LIBS += -losg \
-    -losgViewer \
-    -losgEarth
-DEFINES += QGC_OSG_ENABLED
-}
+    exists(/usr/include/osg) {
+    message("Building support for OpenSceneGraph")
+    DEPENDENCIES_PRESENT += osg
+    # Include OpenSceneGraph libraries
+    LIBS += -losg
+    DEFINES += QGC_OSG_ENABLED
+    }
+
+    exists(/usr/include/osgEarth) {
+    message("Building support for osgEarth")
+    DEPENDENCIES_PRESENT += osgearth
+    # Include osgEarth libraries
+    LIBS += -losgViewer \
+            -losgEarth \
+            -losgEarthUtil
+    DEFINES += QGC_OSGEARTH_ENABLED
+    }
+
+    exists(/usr/local/include/libfreenect) {
+    message("Building support for libfreenect")
+    DEPENDENCIES_PRESENT += libfreenect
+    INCLUDEPATH += /usr/include/libusb-1.0
+    # Include libfreenect libraries
+    LIBS += -lfreenect
+    DEFINES += QGC_LIBFREENECT_ENABLED
+    }
 
+    # osg/osgEarth dynamic casts might fail without this compiler option.
+    # see http://osgearth.org/wiki/FAQ for details.
+    QMAKE_CXXFLAGS += -Wl, -E
 }
 
 # Windows (32bit)
@@ -222,7 +310,13 @@ win32-msvc2008 {
     QMAKE_PRE_LINK += cp -f $$BASEDIR/lib/sdl/win32/SDL.dll $$TARGETDIR/debug/. &&
     QMAKE_PRE_LINK += cp -f $$BASEDIR/lib/sdl/win32/SDL.dll $$TARGETDIR/release/. &&
     QMAKE_PRE_LINK += cp -rf $$BASEDIR/audio $$TARGETDIR/debug/. &&
-    QMAKE_PRE_LINK += cp -rf $$BASEDIR/audio $$TARGETDIR/release/.
+    QMAKE_PRE_LINK += cp -rf $$BASEDIR/audio $$TARGETDIR/release/. &&
+    QMAKE_PRE_LINK += cp -rf $$BASEDIR/models $$TARGETDIR/debug/. &&
+    QMAKE_PRE_LINK += cp -rf $$BASEDIR/models $$TARGETDIR/release/.
+
+    # osg/osgEarth dynamic casts might fail without this compiler option.
+    # see http://osgearth.org/wiki/FAQ for details.
+    QMAKE_CXXFLAGS += /Wl /E
 }
 
 # Windows (32bit)
@@ -255,8 +349,14 @@ win32-g++ {
     # Copy dependencies
     QMAKE_PRE_LINK += cp -f $$BASEDIR/lib/sdl/win32/SDL.dll $$BUILDDIR/debug/. &&
     QMAKE_PRE_LINK += cp -f $$BASEDIR/lib/sdl/win32/SDL.dll $$BUILDDIR/release/. &&
-    QMAKE_PRE_LINK += cp -rf $$BASEDIR/audio $$BUILDDIR/debug/. &&
-    QMAKE_PRE_LINK += cp -rf $$BASEDIR/audio $$BUILDDIR/release/.
+    QMAKE_PRE_LINK += cp -rf $$BASEDIR/audio $$TARGETDIR/debug/. &&
+    QMAKE_PRE_LINK += cp -rf $$BASEDIR/audio $$TARGETDIR/release/.
+    QMAKE_PRE_LINK += cp -rf $$BASEDIR/models $$TARGETDIR/debug/. &&
+    QMAKE_PRE_LINK += cp -rf $$BASEDIR/models $$TARGETDIR/release/.
+
+    # osg/osgEarth dynamic casts might fail without this compiler option.
+    # see http://osgearth.org/wiki/FAQ for details.
+    QMAKE_CXXFLAGS += -Wl, -E
 }
 
 # Windows (64bit)
@@ -291,5 +391,8 @@ win64-g++ {
     QMAKE_PRE_LINK += cp -f $$BASEDIR/lib/sdl/win32/SDL.dll $$BUILDDIR/release/. &&
     QMAKE_PRE_LINK += cp -rf $$BASEDIR/audio $$BUILDDIR/debug/. &&
     QMAKE_PRE_LINK += cp -rf $$BASEDIR/audio $$BUILDDIR/release/.
-}
 
+    # osg/osgEarth dynamic casts might fail without this compiler option.
+    # see http://osgearth.org/wiki/FAQ for details.
+    QMAKE_CXXFLAGS += -Wl, -E
+}

qgroundcontrol.pro

@@ -231,18 +231,35 @@ HEADERS += src/MG.h \
     src/ui/RadioCalibration/CurveCalibrator.h \
     src/ui/RadioCalibration/AbstractCalibrator.h \
     src/comm/QGCMAVLink.h
-contains(DEPENDENCIES_PRESENT, osgearth) { 
-    message("Including headers for OSGEARTH")
+
+
+contains(DEPENDENCIES_PRESENT, osg) { 
+    message("Including headers for OpenSceneGraph")
     
     # Enable only if OpenSceneGraph is available
     HEADERS += src/ui/map3D/Q3DWidget.h \
+        src/ui/map3D/GCManipulator.h \
+        src/ui/map3D/ImageWindowGeode.h \
         src/ui/map3D/QOSGWidget.h \
-        src/ui/map3D/QMap3D.h \
         src/ui/map3D/PixhawkCheetahGeode.h \
         src/ui/map3D/Pixhawk3DWidget.h \
-        src/ui/map3D/Q3DWidgetFactory.h \
-        src/ui/map3D/GCManipulator.h
+        src/ui/map3D/Q3DWidgetFactory.h
+
+contains(DEPENDENCIES_PRESENT, osgearth) { 
+    message("Including headers for OSGEARTH")
+    
+    # Enable only if OpenSceneGraph is available
+    HEADERS += src/ui/map3D/QMap3D.h
+}
 }
+
+contains(DEPENDENCIES_PRESENT, libfreenect) { 
+    message("Including headers for libfreenect")
+    
+    # Enable only if libfreenect is available
+    HEADERS += src/input/Freenect.h
+}
+
 SOURCES += src/main.cc \
     src/Core.cc \
     src/uas/UASManager.cc \
@@ -311,19 +328,39 @@ SOURCES += src/main.cc \
     src/ui/RadioCalibration/SwitchCalibrator.cc \
     src/ui/RadioCalibration/CurveCalibrator.cc \
     src/ui/RadioCalibration/AbstractCalibrator.cc \
-    src/ui/RadioCalibration/RadioCalibrationData.cc # src/ui/WaypointGlobalView.cc \
-contains(DEPENDENCIES_PRESENT, osgearth) { 
-    message("Including sources for OSGEARTH")
+    src/ui/RadioCalibration/RadioCalibrationData.cc
+
+contains(DEPENDENCIES_PRESENT, osg) { 
+    message("Including sources for OpenSceneGraph")
     
     # Enable only if OpenSceneGraph is available
     SOURCES += src/ui/map3D/Q3DWidget.cc \
+    src/ui/map3D/ImageWindowGeode.cc \
+    src/ui/map3D/GCManipulator.cc \
     src/ui/map3D/QOSGWidget.cc \
-        src/ui/map3D/QMap3D.cc \
         src/ui/map3D/PixhawkCheetahGeode.cc \
         src/ui/map3D/Pixhawk3DWidget.cc \
-        src/ui/map3D/Q3DWidgetFactory.cc \
-        src/ui/map3D/GCManipulator.cc
+        src/ui/map3D/Q3DWidgetFactory.cc
+
+
+
+contains(DEPENDENCIES_PRESENT, osgearth) { 
+    message("Including sources for osgEarth")
+    
+    # Enable only if OpenSceneGraph is available
+    SOURCES += src/ui/map3D/QMap3D.cc
+
+}
 }
+
+contains(DEPENDENCIES_PRESENT, libfreenect) { 
+    message("Including sources for libfreenect")
+    
+    # Enable only if libfreenect is available
+    SOURCES += src/input/Freenect.cc
+}
+
+
 RESOURCES += mavground.qrc
 
 # Include RT-LAB Library

src/input/Freenect.cc

+#include "Freenect.h"
+
+#include <cmath>
+#include <string.h>
+#include <QDebug>
+
+Freenect::Freenect()
+    : context(NULL)
+    , device(NULL)
+    , tiltAngle(0)
+{
+    for (int i = 0; i < 2048; ++i)
+    {
+        float v = static_cast<float>(i) / 2048.0f;
+        v = powf(v, 3.0f) * 6.0f;
+        gammaTable[i] = static_cast<unsigned short>(v * 6.0f * 256.0f);
+    }
+}
+
+Freenect::~Freenect()
+{
+    if (device != NULL)
+    {
+        freenect_stop_depth(device);
+        freenect_stop_rgb(device);
+    }
+
+    freenect_close_device(device);
+
+    freenect_shutdown(context);
+}
+
+bool
+Freenect::init(int userDeviceNumber)
+{
+    if (freenect_init(&context, NULL) < 0)
+    {
+        return false;
+    }
+
+    freenect_set_log_level(context, FREENECT_LOG_DEBUG);
+
+    if (freenect_num_devices(context) < 1)
+    {
+        return false;
+    }
+
+    if (freenect_open_device(context, &device, userDeviceNumber) < 0)
+    {
+        return false;
+    }
+
+    freenect_set_user(device, this);
+
+    memset(rgb, 0, FREENECT_RGB_SIZE);
+    memset(depth, 0, FREENECT_DEPTH_SIZE);
+
+    // set Kinect parameters
+    if (freenect_set_tilt_degs(device, tiltAngle) != 0)
+    {
+        return false;
+    }
+    if (freenect_set_led(device, LED_RED) != 0)
+    {
+        return false;
+    }
+    if (freenect_set_rgb_format(device, FREENECT_FORMAT_RGB) != 0)
+    {
+        return false;
+    }
+    if (freenect_set_depth_format(device, FREENECT_FORMAT_11_BIT) != 0)
+    {
+        return false;
+    }
+    freenect_set_rgb_callback(device, rgbCallback);
+    freenect_set_depth_callback(device, depthCallback);
+
+    if (freenect_start_rgb(device) != 0)
+    {
+        return false;
+    }
+    if (freenect_start_depth(device) != 0)
+    {
+        return false;
+    }
+
+    thread.reset(new FreenectThread(device));
+    thread->start();
+
+    return true;
+}
+
+bool
+Freenect::process(void)
+{
+    if (freenect_process_events(context) < 0)
+    {
+        return false;
+    }
+
+    freenect_get_raw_accel(device, &ax, &ay, &az);
+    freenect_get_mks_accel(device, &dx, &dy, &dz);
+
+    return true;
+}
+
+QSharedPointer<QByteArray>
+Freenect::getRgbData(void)
+{
+    QMutexLocker locker(&rgbMutex);
+    return QSharedPointer<QByteArray>(
+            new QByteArray(rgb, FREENECT_RGB_SIZE));
+}
+
+QSharedPointer<QByteArray>
+Freenect::getRawDepthData(void)
+{
+    QMutexLocker locker(&depthMutex);
+    return QSharedPointer<QByteArray>(
+            new QByteArray(depth, FREENECT_DEPTH_SIZE));
+}
+
+QSharedPointer<QByteArray>
+Freenect::getDistanceData(void)
+{
+    QMutexLocker locker(&distanceMutex);
+    return QSharedPointer<QByteArray>(
+            new QByteArray(reinterpret_cast<char *>(distance),
+                           FREENECT_FRAME_PIX * sizeof(float)));
+}
+
+QSharedPointer<QByteArray>
+Freenect::getColoredDepthData(void)
+{
+    QMutexLocker locker(&coloredDepthMutex);
+    return QSharedPointer<QByteArray>(
+            new QByteArray(coloredDepth, FREENECT_RGB_SIZE));
+}
+
+int
+Freenect::getTiltAngle(void) const
+{
+    return tiltAngle;
+}
+
+void
+Freenect::setTiltAngle(int angle)
+{
+    if (angle > 30)
+    {
+        angle = 30;
+    }
+    if (angle < -30)
+    {
+        angle = -30;
+    }
+
+    tiltAngle = angle;
+}
+
+Freenect::FreenectThread::FreenectThread(freenect_device* _device)
+{
+    device = _device;
+}
+
+void
+Freenect::FreenectThread::run(void)
+{
+    Freenect* freenect = static_cast<Freenect *>(freenect_get_user(device));
+    while (1)
+    {
+        freenect->process();
+    }
+}
+
+void
+Freenect::rgbCallback(freenect_device* device, freenect_pixel* rgb, uint32_t timestamp)
+{
+    Freenect* freenect = static_cast<Freenect *>(freenect_get_user(device));
+
+    QMutexLocker locker(&freenect->rgbMutex);
+    memcpy(freenect->rgb, rgb, FREENECT_RGB_SIZE);
+}
+
+void
+Freenect::depthCallback(freenect_device* device, freenect_depth* depth, uint32_t timestamp)
+{
+    Freenect* freenect = static_cast<Freenect *>(freenect_get_user(device));
+    freenect_depth* data = reinterpret_cast<freenect_depth *>(depth);
+
+    QMutexLocker depthLocker(&freenect->depthMutex);
+    memcpy(freenect->depth, data, FREENECT_DEPTH_SIZE);
+
+    QMutexLocker distanceLocker(&freenect->distanceMutex);
+    for (int i = 0; i < FREENECT_FRAME_PIX; ++i)
+    {
+        freenect->distance[i] =
+                100.f / (-0.00307f * static_cast<float>(data[i]) + 3.33f);
+    }
+
+    QMutexLocker coloredDepthLocker(&freenect->coloredDepthMutex);
+    unsigned short* src = reinterpret_cast<unsigned short *>(data);
+    unsigned char* dst = reinterpret_cast<unsigned char *>(freenect->coloredDepth);
+    for (int i = 0; i < FREENECT_FRAME_PIX; ++i)
+    {
+        unsigned short pval = freenect->gammaTable[src[i]];
+        unsigned short lb = pval & 0xFF;
+        switch (pval >> 8)
+        {
+        case 0:
+            dst[3 * i] = 255;
+            dst[3 * i + 1] = 255 - lb;
+            dst[3 * i + 2] = 255 - lb;
+            break;
+        case 1:
+            dst[3 * i] = 255;
+            dst[3 * i + 1] = lb;
+            dst[3 * i + 2] = 0;
+            break;
+        case 2:
+            dst[3 * i] = 255 - lb;
+            dst[3 * i + 1] = 255;
+            dst[3 * i + 2] = 0;
+            break;
+        case 3:
+            dst[3 * i] = 0;
+            dst[3 * i + 1] = 255;
+            dst[3 * i + 2] = lb;
+            break;
+        case 4:
+            dst[3 * i] = 0;
+            dst[3 * i + 1] = 255 - lb;
+            dst[3 * i + 2] = 255;
+            break;
+        case 5:
+            dst[3 * i] = 0;
+            dst[3 * i + 1] = 0;
+            dst[3 * i + 2] = 255 - lb;
+            break;
+        default:
+            dst[3 * i] = 0;
+            dst[3 * i + 1] = 0;
+            dst[3 * i + 2] = 0;
+            break;
+        }
+    }
+}

src/input/Freenect.h

+#ifndef FREENECT_H
+#define FREENECT_H
+
+#include <libfreenect.h>
+#include <QMutex>
+#include <QScopedPointer>
+#include <QSharedPointer>
+#include <QThread>
+
+class Freenect
+{
+public:
+    Freenect();
+    ~Freenect();
+
+    bool init(int userDeviceNumber = 0);
+    bool process(void);
+
+    QSharedPointer<QByteArray> getRgbData(void);
+    QSharedPointer<QByteArray> getRawDepthData(void);
+    QSharedPointer<QByteArray> getDistanceData(void);
+    QSharedPointer<QByteArray> getColoredDepthData(void);
+
+    int getTiltAngle(void) const;
+    void setTiltAngle(int angle);
+
+private:
+    static void rgbCallback(freenect_device* device, freenect_pixel* rgb, uint32_t timestamp);
+    static void depthCallback(freenect_device* device, freenect_depth* depth, uint32_t timestamp);
+
+    freenect_context* context;
+    freenect_device* device;
+
+    class FreenectThread : public QThread
+    {
+    public:
+        explicit FreenectThread(freenect_device* _device);
+
+    protected:
+        virtual void run(void);
+
+        freenect_device* device;
+    };
+    QScopedPointer<FreenectThread> thread;
+
+    // tilt angle of Kinect camera
+    int tiltAngle;
+
+    // rgbd data
+    char rgb[FREENECT_RGB_SIZE];
+    QMutex rgbMutex;
+
+    char depth[FREENECT_DEPTH_SIZE];
+    QMutex depthMutex;
+
+    float distance[FREENECT_FRAME_PIX];
+    QMutex distanceMutex;
+
+    char coloredDepth[FREENECT_RGB_SIZE];
+    QMutex coloredDepthMutex;
+
+    // accelerometer data
+    short ax, ay, az;
+    double dx, dy, dz;
+
+    // gamma map
+    unsigned short gammaTable[2048];
+};
+
+#endif // FREENECT_H

src/ui/MainWindow.cc

@@ -47,7 +47,7 @@ This file is part of the QGROUNDCONTROL project
 #include "GAudioOutput.h"
 
 #ifdef QGC_OSG_ENABLED
-#include "QMap3D.h"
+#include "Q3DWidgetFactory.h"
 #endif
 
 // FIXME Move
@@ -136,10 +136,13 @@ void MainWindow::buildWidgets()
     protocolWidget    = new XMLCommProtocolWidget(this);
     dataplotWidget    = new QGCDataPlot2D(this);
     #ifdef QGC_OSG_ENABLED
-    //_3DWidget         = Q3DWidgetFactory::get(QGC_MAP3D_OSGEARTH);
-    _3DWidget = new QMap3D(this);
+    _3DWidget         = Q3DWidgetFactory::get("PIXHAWK");
     #endif
 
+#ifdef QGC_OSGEARTH_ENABLED
+    _3DMapWidget = Q3DWidgetFactory::get("MAP3D");
+#endif
+
     // Dock widgets
     controlDockWidget = new QDockWidget(tr("Control"), this);
     controlDockWidget->setWidget( new UASControlWidget(this) );
@@ -232,6 +235,9 @@ void MainWindow::arrangeCenterStack()
     if (mapWidget) centerStack->addWidget(mapWidget);
     #ifdef QGC_OSG_ENABLED
     if (_3DWidget) centerStack->addWidget(_3DWidget);
+#endif
+    #ifdef QGC_OSGEARTH_ENABLED
+    if (_3DMapWidget) centerStack->addWidget(_3DMapWidget);
     #endif
     if (hudWidget) centerStack->addWidget(hudWidget);
     if (dataplotWidget) centerStack->addWidget(dataplotWidget);
@@ -373,6 +379,7 @@ void MainWindow::connectActions()
     connect(ui.actionEngineerView, SIGNAL(triggered()), this, SLOT(loadEngineerView()));
     connect(ui.actionOperatorView, SIGNAL(triggered()), this, SLOT(loadOperatorView()));
     connect(ui.action3DView, SIGNAL(triggered()), this, SLOT(load3DView()));
+    connect(ui.action3DMapView, SIGNAL(triggered()), this, SLOT(load3DMapView()));
     connect(ui.actionShow_full_view, SIGNAL(triggered()), this, SLOT(loadAllView()));
     connect(ui.actionShow_MAVLink_view, SIGNAL(triggered()), this, SLOT(loadMAVLinkView()));
     connect(ui.actionShow_data_analysis_view, SIGNAL(triggered()), this, SLOT(loadDataView()));
@@ -672,7 +679,7 @@ void MainWindow::loadPixhawkView()
     clearView();
     // Engineer view, used in EMAV2009
 
-        #ifdef QGC_OSG_ENABLED
+#ifdef QGC_OSG_ENABLED
     // 3D map
     if (_3DWidget)
     {
@@ -960,6 +967,60 @@ void MainWindow::loadGlobalOperatorView()
 
 }
 
+void MainWindow::load3DMapView()
+{
+        #ifdef QGC_OSGEARTH_ENABLED
+            clearView();
+
+            // 3D map
+            if (_3DMapWidget)
+            {
+                QStackedWidget *centerStack = dynamic_cast<QStackedWidget*>(centralWidget());
+                if (centerStack)
+                {
+                    //map3DWidget->setActive(true);
+                    centerStack->setCurrentWidget(_3DMapWidget);
+                }
+            }
+
+            // UAS CONTROL
+            if (controlDockWidget)
+            {
+                addDockWidget(Qt::LeftDockWidgetArea, controlDockWidget);
+                controlDockWidget->show();
+            }
+
+            // UAS LIST
+            if (listDockWidget)
+            {
+                addDockWidget(Qt::BottomDockWidgetArea, listDockWidget);
+                listDockWidget->show();
+            }
+
+            // WAYPOINT LIST
+            if (waypointsDockWidget)
+            {
+                addDockWidget(Qt::BottomDockWidgetArea, waypointsDockWidget);
+                waypointsDockWidget->show();
+            }
+
+            // HORIZONTAL SITUATION INDICATOR
+            if (hsiDockWidget)
+            {
+                HSIDisplay* hsi = dynamic_cast<HSIDisplay*>( hsiDockWidget->widget() );
+                if (hsi)
+                {
+                    hsi->start();
+                    addDockWidget(Qt::LeftDockWidgetArea, hsiDockWidget);
+                    hsiDockWidget->show();
+                }
+            }
+#endif
+            this->show();
+
+        }
+
+
 void MainWindow::load3DView()
 {
         #ifdef QGC_OSG_ENABLED

src/ui/MainWindow.h

@@ -63,10 +63,6 @@ This file is part of the QGROUNDCONTROL project
 #include "HSIDisplay.h"
 #include "QGCDataPlot2D.h"
 #include "QGCRemoteControlView.h"
-#ifdef QGC_OSG_ENABLED
-//#include "Q3DWidget.h"
-#include "QMap3D.h"
-#endif
 
 #include "LogCompressor.h"
 
@@ -117,6 +113,8 @@ public slots:
     void loadOperatorView();
     /** @brief Load 3D view */
     void load3DView();
+    /** @brief Load 3D map view */
+    void load3DMapView();
     /** @brief Load view with all widgets */
     void loadAllView();
     /** @brief Load MAVLink XML generator view */
@@ -167,7 +165,10 @@ protected:
     QPointer<XMLCommProtocolWidget> protocolWidget;
     QPointer<QGCDataPlot2D> dataplotWidget;
     #ifdef QGC_OSG_ENABLED
-    QPointer<QMap3D> _3DWidget;
+    QPointer<QWidget> _3DWidget;
+    #endif
+    #ifdef QGC_OSGEARTH_ENABLED
+    QPointer<QWidget> _3DMapWidget;
     #endif
     // Dock widgets
     QPointer<QDockWidget> controlDockWidget;

src/ui/MainWindow.ui

@@ -75,6 +75,7 @@
     <addaction name="actionEngineerView"/>
     <addaction name="actionPilotView"/>
     <addaction name="actionOperatorView"/>
+    <addaction name="action3DMapView"/>
     <addaction name="action3DView"/>
     <addaction name="actionGlobalOperatorView"/>
     <addaction name="separator"/>
@@ -234,7 +235,7 @@
      <normaloff>:/images/categories/preferences-system.svg</normaloff>:/images/categories/preferences-system.svg</iconset>
    </property>
    <property name="text">
-    <string>Show 3D view</string>
+    <string>Show 3D local view</string>
    </property>
    <property name="toolTip">
     <string>Show 3D view</string>
@@ -318,6 +319,15 @@
     <string>Show Global operator view</string>
    </property>
   </action>
+  <action name="action3DMapView">
+   <property name="icon">
+    <iconset resource="../../mavground.qrc">
+     <normaloff>:/images/categories/applications-internet.svg</normaloff>:/images/categories/applications-internet.svg</iconset>
+   </property>
+   <property name="text">
+    <string>Show 3D Globe view</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <resources>

src/ui/map3D/GCManipulator.cc

@@ -254,7 +254,7 @@ GCManipulator::calcMovement()
     if (buttonMask == GUIEventAdapter::LEFT_MOUSE_BUTTON)
     {
         // rotate camera
-        osg::Vec3 axis;
+        osg::Vec3d axis;
         float angle;
 
         float px0 = _ga_t0->getXnormalized();

src/ui/map3D/ImageWindowGeode.cc

+///*=====================================================================
+//
+//QGroundControl Open Source Ground Control Station
+//
+//(c) 2009, 2010 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+//
+//This file is part of the QGROUNDCONTROL project
+//
+//    QGROUNDCONTROL is free software: you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation, either version 3 of the License, or
+//    (at your option) any later version.
+//
+//    QGROUNDCONTROL is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with QGROUNDCONTROL. If not, see <http://www.gnu.org/licenses/>.
+//
+//======================================================================*/
+
+/**
+ * @file
+ *   @brief Definition of the class ImageWindowGeode.
+ *
+ *   @author Lionel Heng <hengli@student.ethz.ch>
+ *
+ */
+
+#include "ImageWindowGeode.h"
+
+ImageWindowGeode::ImageWindowGeode(const QString& caption,
+                                   const osg::Vec4& backgroundColor,
+                                   osg::ref_ptr<osg::Image>& image)
+    : border(5)
+{
+    // image
+    osg::ref_ptr<osg::Geometry> imageGeometry = new osg::Geometry;
+    imageVertices = new osg::Vec3Array(4);
+
+    osg::ref_ptr<osg::Vec2Array> textureCoords = new osg::Vec2Array;
+    textureCoords->push_back(osg::Vec2(0.0f, 1.0f));
+    textureCoords->push_back(osg::Vec2(1.0f, 1.0f));
+    textureCoords->push_back(osg::Vec2(1.0f, 0.0f));
+    textureCoords->push_back(osg::Vec2(0.0f, 0.0f));
+
+    osg::ref_ptr<osg::Vec4Array> imageColors(new osg::Vec4Array);
+    imageColors->push_back(osg::Vec4(1.0f, 1.0f, 1.0f, 1.0f));
+    imageGeometry->setColorArray(imageColors);
+    imageGeometry->setColorBinding(osg::Geometry::BIND_OVERALL);
+
+    imageGeometry->setVertexArray(imageVertices);
+    imageGeometry->setTexCoordArray(0, textureCoords);
+
+    imageGeometry->addPrimitiveSet(new osg::DrawArrays(osg::PrimitiveSet::POLYGON,
+                                                       0, imageVertices->size()));
+
+    osg::ref_ptr<osg::Texture2D> texture = new osg::Texture2D;
+    texture->setDataVariance(osg::Object::DYNAMIC);
+    texture->setImage(image);
+    texture->setResizeNonPowerOfTwoHint(false);
+
+    imageGeometry->getOrCreateStateSet()->
+            setTextureAttributeAndModes(0, texture, osg::StateAttribute::ON);
+    imageGeometry->setUseDisplayList(false);
+
+    // background
+    osg::ref_ptr<osg::Geometry> backgroundGeometry = new osg::Geometry;
+    backgroundVertices = new osg::Vec3Array(4);
+    backgroundGeometry->setVertexArray(backgroundVertices);
+    backgroundGeometry->addPrimitiveSet(new osg::DrawArrays(osg::PrimitiveSet::POLYGON,
+                                                            0, backgroundVertices->size()));
+    osg::ref_ptr<osg::Vec4Array> backgroundColors(new osg::Vec4Array);
+    backgroundColors->push_back(backgroundColor);
+    backgroundGeometry->setColorArray(backgroundColors);
+    backgroundGeometry->setColorBinding(osg::Geometry::BIND_OVERALL);
+    backgroundGeometry->setUseDisplayList(false);
+
+    // caption
+    text = new osgText::Text;
+    text->setText(caption.toStdString().c_str());
+    text->setCharacterSize(11);
+    text->setFont("images/Vera.ttf");
+    text->setAxisAlignment(osgText::Text::SCREEN);
+    text->setColor(osg::Vec4(1.0f, 1.0f, 1.0f, 1.0f));
+
+    addDrawable(imageGeometry);
+    addDrawable(backgroundGeometry);
+    addDrawable(text);
+
+    setAttributes(0, 0, 0, 0);
+}
+
+void
+ImageWindowGeode::setAttributes(int x, int y, int width, int height)
+{
+    int imageWidth = width - border * 2;
+    int imageHeight = height - border * 2 - 15;
+    int imageXPosition = x + border;
+    int imageYPosition = y + border;
+
+    imageVertices->at(0) = osg::Vec3(imageXPosition, imageYPosition, 0);
+    imageVertices->at(1) = osg::Vec3(imageXPosition + imageWidth, imageYPosition, 0);
+    imageVertices->at(2) = osg::Vec3(imageXPosition + imageWidth, imageYPosition + imageHeight, 0);
+    imageVertices->at(3) = osg::Vec3(imageXPosition, imageYPosition + imageHeight, 0);
+
+    text->setPosition(osg::Vec3(imageXPosition, imageYPosition + imageHeight + 5, 0));
+
+    backgroundVertices->at(0) = osg::Vec3(x, y, -1);
+    backgroundVertices->at(1) = osg::Vec3(x + width, y, -1);
+    backgroundVertices->at(2) = osg::Vec3(x + width, y + height, -1);
+    backgroundVertices->at(3) = osg::Vec3(x, y + height, -1);
+}

src/ui/map3D/ImageWindowGeode.h

+///*=====================================================================
+//
+//QGroundControl Open Source Ground Control Station
+//
+//(c) 2009, 2010 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+//
+//This file is part of the QGROUNDCONTROL project
+//
+//    QGROUNDCONTROL is free software: you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation, either version 3 of the License, or
+//    (at your option) any later version.
+//
+//    QGROUNDCONTROL is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with QGROUNDCONTROL. If not, see <http://www.gnu.org/licenses/>.
+//
+//======================================================================*/
+
+/**
+ * @file
+ *   @brief Definition of the class ImageWindowGeode.
+ *
+ *   @author Lionel Heng <hengli@student.ethz.ch>
+ *
+ */
+
+#ifndef IMAGEWINDOWGEODE_H
+#define IMAGEWINDOWGEODE_H
+
+#include <osg/Geode>
+#include <osg/Geometry>
+#include <osgText/Text>
+#include <QString>
+
+class ImageWindowGeode : public osg::Geode
+{
+public:
+    ImageWindowGeode(const QString& caption, const osg::Vec4& backgroundColor,
+                     osg::ref_ptr<osg::Image>& image);
+
+    void setAttributes(int x, int y, int width, int height);
+
+private:
+    int border;
+
+    osg::ref_ptr<osg::Vec3Array> imageVertices;
+    osg::ref_ptr<osg::Vec3Array> backgroundVertices;
+    osg::ref_ptr<osgText::Text> text;
+};
+
+#endif // IMAGEWINDOWGEODE_H

src/ui/map3D/Imagery.h

+/*=====================================================================
+
+QGroundControl Open Source Ground Control Station
+
+(c) 2009, 2010 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+
+This file is part of the QGROUNDCONTROL project
+
+    QGROUNDCONTROL is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    QGROUNDCONTROL is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with QGROUNDCONTROL. If not, see <http://www.gnu.org/licenses/>.
+
+======================================================================*/
+
+/**
+ * @file
+ *   @brief Definition of the class Imagery.
+ *
+ *   @author Lionel Heng <hengli@student.ethz.ch>
+ *
+ */
+
+#ifndef IMAGERY_H
+#define IMAGERY_H
+
+#include <QScopedPointer>
+#include <QString>
+
+#include "TextureCache.h"
+
+class Imagery
+{
+public:
+    enum ImageryType
+    {
+        GOOGLE_MAP = 0,
+        GOOGLE_SATELLITE = 1,
+        SWISSTOPO_SATELLITE = 2,
+        SWISSTOPO_SATELLITE_3D = 3
+    };
+
+    Imagery();
+
+    void setImageryType(ImageryType type);
+    void setOffset(double xOffset, double yOffset);
+
+    void prefetch2D(double windowWidth, double windowHeight,
+                    double zoom, double xOrigin, double yOrigin,
+                    double viewXOffset, double viewYOffset,
+                    const QString& utmZone);
+    void draw2D(double windowWidth, double windowHeight,
+                double zoom, double xOrigin, double yOrigin,
+                double viewXOffset, double viewYOffset,
+                const QString& utmZone);
+
+    void prefetch3D(double radius, double tileResolution,
+                    double xOrigin, double yOrigin,
+                    double viewXOffset, double viewYOffset,
+                    const QString& utmZone, bool useHeightModel);
+    void draw3D(double radius, double tileResolution,
+                double xOrigin, double yOrigin,
+                double viewXOffset, double viewYOffset,
+                const QString& utmZone, bool useHeightModel);
+
+    bool update(void);
+
+private:
+    void imageBounds(int tileX, int tileY, double tileResolution,
+                     double& x1, double& y1, double& x2, double& y2,
+                     double& x3, double& y3, double& x4, double& y4) const;
+    void tileBounds(double tileResolution,
+                    double minUtmX, double minUtmY,
+                    double maxUtmX, double maxUtmY, const QString& utmZone,
+                    int& minTileX, int& minTileY,
+                    int& maxTileX, int& maxTileY,
+                    int& zoomLevel) const;
+
+    double tileXToLongitude(int tileX, int numTiles) const;
+    double tileYToLatitude(int tileY, int numTiles) const;
+    int longitudeToTileX(double longitude, int numTiles) const;
+    int latitudeToTileY(double latitude, int numTiles) const;
+
+    void UTMtoTile(double northing, double easting, const QString& utmZone,
+                   double tileResolution, int& tileX, int& tileY,
+                   int& zoomLevel) const;
+    QChar UTMLetterDesignator(double latitude) const;
+
+    void LLtoUTM(double latitude, double longitude,
+                 double& utmNorthing, double& utmEasting,
+                 QString& utmZone) const;
+    void UTMtoLL(double utmNorthing, double utmEasting, const QString& utmZone,
+                 double& latitude, double& longitude) const;
+
+    QString getTileLocation(int tileX, int tileY, int zoomLevel,
+                            double tileResolution) const;
+
+    QScopedPointer<TextureCache> textureCache;
+
+    ImageryType currentImageryType;
+
+    double xOffset;
+    double yOffset;
+};
+
+#endif // IMAGERY_H

src/ui/map3D/Pixhawk3DWidget.h

@@ -33,7 +33,15 @@
 #define PIXHAWK3DWIDGET_H
 
 #include <osgText/Text>
+#ifdef QGC_OSGEARTH_ENABLED
 #include <osgEarth/MapNode>
+#endif
+
+#include "ImageWindowGeode.h"
+
+#ifdef QGC_LIBFREENECT_ENABLED
+#include "Freenect.h"
+#endif
 
 #include "Q3DWidget.h"
 
@@ -50,10 +58,6 @@ public:
     explicit Pixhawk3DWidget(QWidget* parent = 0);
     ~Pixhawk3DWidget();
 
-    void buildLayout(void);
-
-    double getTime(void) const;
-
 public slots:
     void setActiveUAS(UASInterface* uas);
 
@@ -61,11 +65,15 @@ private slots:
     void showGrid(int state);
     void showTrail(int state);
     void showWaypoints(int state);
+    void selectVehicleModel(int index);
     void recenter(void);
     void toggleFollowCamera(int state);
 
 protected:
+    QVector< osg::ref_ptr<osg::Node> > findVehicleModels(void);
+    void buildLayout(void);
     virtual void display(void);
+    virtual void keyPressEvent(QKeyEvent* event);
     virtual void mousePressEvent(QMouseEvent* event);
 
     UASInterface* uas;
@@ -73,17 +81,26 @@ protected:
 private:
     osg::ref_ptr<osg::Geode> createGrid(void);
     osg::ref_ptr<osg::Geode> createTrail(void);
+
+#ifdef QGC_OSGEARTH_ENABLED
     osg::ref_ptr<osgEarth::MapNode> createMap(void);
+#endif
+
     osg::ref_ptr<osg::Node> createTarget(void);
     osg::ref_ptr<osg::Group> createWaypoints(void);
+    osg::ref_ptr<osg::Geode> createRGBD3D(void);
 
     void setupHUD(void);
+    void resizeHUD(void);
 
     void updateHUD(float robotX, float robotY, float robotZ,
                    float robotRoll, float robotPitch, float robotYaw);
     void updateTrail(float robotX, float robotY, float robotZ);
     void updateTarget(void);
     void updateWaypoints(void);
+#ifdef QGC_LIBFREENECT_ENABLED
+    void updateRGBD(void);
+#endif
 
     void markTarget(void);
 
@@ -91,22 +108,39 @@ private:
     bool displayTrail;
     bool displayTarget;
     bool displayWaypoints;
+    bool displayRGBD2D;
+    bool displayRGBD3D;
 
     bool followCamera;
 
     osg::ref_ptr<osg::Vec3Array> trailVertices;
     QVarLengthArray<osg::Vec3, 10000> trail;
 
+    osg::ref_ptr<osg::Node> vehicleModel;
     osg::ref_ptr<osg::Geometry> hudBackgroundGeometry;
     osg::ref_ptr<osgText::Text> statusText;
+    osg::ref_ptr<ImageWindowGeode> rgb2DGeode;
+    osg::ref_ptr<ImageWindowGeode> depth2DGeode;
+    osg::ref_ptr<osg::Image> rgbImage;
+    osg::ref_ptr<osg::Image> depthImage;
     osg::ref_ptr<osg::Geode> gridNode;
     osg::ref_ptr<osg::Geode> trailNode;
     osg::ref_ptr<osg::Geometry> trailGeometry;
     osg::ref_ptr<osg::DrawArrays> trailDrawArrays;
+#ifdef QGC_OSGEARTH_ENABLED
     osg::ref_ptr<osgEarth::MapNode> mapNode;
+#endif
     osg::ref_ptr<osg::Geode> targetNode;
     osg::ref_ptr<osg::PositionAttitudeTransform> targetPosition;
     osg::ref_ptr<osg::Group> waypointsNode;
+    osg::ref_ptr<osg::Geode> rgbd3DNode;
+#ifdef QGC_LIBFREENECT_ENABLED
+    QScopedPointer<Freenect> freenect;
+#endif
+    QSharedPointer<QByteArray> rgb;
+    QSharedPointer<QByteArray> coloredDepth;
+
+    QVector< osg::ref_ptr<osg::Node> > vehicleModels;
 
     QPushButton* targetButton;
 

src/ui/map3D/PixhawkCheetahGeode.cc

@@ -59358,6 +59358,7 @@ osg::ref_ptr<osg::Geode>
 PixhawkCheetahGeode::create(float red, float green, float blue)
 {
     osg::ref_ptr<osg::Geode> geode(new osg::Geode());
+    geode->setName("Pixhawk Bravo");
     osg::ref_ptr<osg::Geometry> geometry(new osg::Geometry());
     geode->addDrawable(geometry.get());
 

src/ui/map3D/Q3DWidget.cc

@@ -34,10 +34,7 @@ This file is part of the QGROUNDCONTROL project
 #include <osg/Geometry>
 #include <osg/LineWidth>
 #include <osg/MatrixTransform>
-
-static const float KEY_ROTATE_AMOUNT = 5.0f;
-static const float KEY_MOVE_AMOUNT   = 10.0f;
-static const float KEY_ZOOM_AMOUNT   = 5.0f;
+#include <Carbon/Carbon.h>
 
 Q3DWidget::Q3DWidget(QWidget* parent)
     : QGLWidget(parent)
@@ -47,7 +44,7 @@ Q3DWidget::Q3DWidget(QWidget* parent)
     , egocentricMap(new osg::Switch())
     , robotPosition(new osg::PositionAttitudeTransform())
     , robotAttitude(new osg::PositionAttitudeTransform())
-    , hudGeode(new osg::Geode())
+    , hudGroup(new osg::Switch())
     , hudProjectionMatrix(new osg::Projection)
 {
     // set initial camera parameters
@@ -94,7 +91,7 @@ Q3DWidget::init(float fps)
     egocentricMap->addChild(createRobot());
 
     // set up camera control
-    cameraManipulator = new GCManipulator;
+    cameraManipulator = new GCManipulator();
     setCameraManipulator(cameraManipulator);
     cameraManipulator->setMinZoomRange(cameraParams.minZoomRange);
     cameraManipulator->setDistance(cameraParams.minZoomRange * 2.0);
@@ -159,11 +156,12 @@ Q3DWidget::createHUD(void)
     hudModelViewMatrix->setReferenceFrame(osg::Transform::ABSOLUTE_RF);
 
     hudProjectionMatrix->addChild(hudModelViewMatrix);
-    hudModelViewMatrix->addChild(hudGeode);
+    hudModelViewMatrix->addChild(hudGroup);
 
     osg::ref_ptr<osg::StateSet> hudStateSet(new osg::StateSet);
-    hudGeode->setStateSet(hudStateSet);
+    hudGroup->setStateSet(hudStateSet);
     hudStateSet->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF);
+    hudStateSet->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
     hudStateSet->setRenderingHint(osg::StateSet::TRANSPARENT_BIN);
     hudStateSet->setRenderBinDetails(11, "RenderBin");
 

src/ui/map3D/Q3DWidget.h

@@ -249,7 +249,7 @@ protected:
     osg::ref_ptr<osg::PositionAttitudeTransform> robotPosition;
     osg::ref_ptr<osg::PositionAttitudeTransform> robotAttitude;
 
-    osg::ref_ptr<osg::Geode> hudGeode; /**< A geode which contains renderable HUD objects. */
+    osg::ref_ptr<osg::Switch> hudGroup; /**< A group which contains renderable HUD objects. */
     osg::ref_ptr<osg::Projection> hudProjectionMatrix; /**< An orthographic projection matrix for HUD display. */
 
     osg::ref_ptr<osgViewer::GraphicsWindowEmbedded> osgGW; /**< A class which manages OSG graphics windows and events. */

src/ui/map3D/Q3DWidgetFactory.cc

@@ -32,16 +32,25 @@ This file is part of the QGROUNDCONTROL project
 #include "Q3DWidgetFactory.h"
 
 #include "Pixhawk3DWidget.h"
+#ifdef QGC_OSGEARTH_ENABLED
+#include "QMap3D.h"
+#endif
 
-QPointer<Q3DWidget>
+QPointer<QWidget>
 Q3DWidgetFactory::get(const std::string& type)
 {
     if (type == "PIXHAWK")
     {
-        return QPointer<Q3DWidget>(new Pixhawk3DWidget);
+        return QPointer<QWidget>(new Pixhawk3DWidget());
     }
+#ifdef QGC_OSGEARTH_ENABLED
+    else if (type == "MAP3D")
+    {
+        return QPointer<QWidget>(new QMap3D());
+    }
+#endif
     else
     {
-        return QPointer<Q3DWidget>(new Q3DWidget);
+        return QPointer<QWidget>(new Q3DWidget());
     }
 }

src/ui/map3D/Q3DWidgetFactory.h

@@ -50,7 +50,7 @@ public:
      * @return A smart pointer to the Q3DWidget instance.
      */
 
-    static QPointer<Q3DWidget> get(const std::string& type);
+    static QPointer<QWidget> get(const std::string& type);
 };
 
 #endif // Q3DWIDGETFACTORY_H

src/ui/map3D/QMap3D.cc

@@ -21,6 +21,8 @@ This file is part of the QGROUNDCONTROL project
 
 ======================================================================*/
 
+#ifdef QGC_OSGEARTH_ENABLED
+
 /**
  * @file
  *   @brief Definition of the class QMap3D.
@@ -62,3 +64,5 @@ void QMap3D::on_pushButton_vehicle_clicked()
     graphicsView->getSceneData()->asGroup()->addChild(osgDB::readNodeFile(vehicleName.toStdString()));
     graphicsView->updateCamera();
 }
+
+#endif

src/ui/map3D/QMap3D.h

@@ -29,6 +29,8 @@ This file is part of the QGROUNDCONTROL project
  *
  */
 
+#ifdef QGC_OSGEARTH_ENABLED
+
 #ifndef QMAP3D_H
 #define QMAP3D_H
 
@@ -52,3 +54,4 @@ public slots:
 
 #endif // QMAP3D_H
 
+#endif

src/ui/map3D/QOSGWidget.cc

@@ -18,23 +18,18 @@
 
 #include "QOSGWidget.h"
 
+#ifdef Q_OS_MACX
+
+#endif
+
 QOSGWidget::QOSGWidget( QWidget * parent, const char * name, WindowFlags f, bool overrideTraits):
-#if USE_QT4
     QWidget(parent, f), _overrideTraits (overrideTraits)
-#else
-    QWidget(parent, name, f), _overrideTraits (overrideTraits)
-#endif
 {
     createContext();
     
-
-#if USE_QT4
     setAttribute(Qt::WA_PaintOnScreen);
     setAttribute(Qt::WA_NoSystemBackground);
     setFocusPolicy(Qt::ClickFocus);   
-#else
-    setBackgroundMode(Qt::NoBackground);
-#endif    
 }
 
 void QOSGWidget::createContext()
@@ -106,9 +101,7 @@ void QOSGWidget::destroyEvent(bool destroyWindow, bool destroySubWindows)
 
 void QOSGWidget::closeEvent( QCloseEvent * event )
 {
-#ifndef USE_QT4
     event->accept();
-#endif
 
     _gw->getEventQueue()->closeWindow();
 }
@@ -123,20 +116,12 @@ void QOSGWidget::resizeEvent( QResizeEvent * event )
 
 void QOSGWidget::keyPressEvent( QKeyEvent* event )
 {
-#if USE_QT4
     _gw->getEventQueue()->keyPress( (osgGA::GUIEventAdapter::KeySymbol) *(event->text().toAscii().data() ) );
-#else
-    _gw->getEventQueue()->keyPress( (osgGA::GUIEventAdapter::KeySymbol) event->ascii() );
-#endif
 }
 
 void QOSGWidget::keyReleaseEvent( QKeyEvent* event )
 {
-#if USE_QT4
     int c = *event->text().toAscii().data();
-#else
-    int c = event->ascii();
-#endif
 
     _gw->getEventQueue()->keyRelease( (osgGA::GUIEventAdapter::KeySymbol) (c) );
 }
@@ -229,8 +214,6 @@ void CompositeViewerQOSG::RemoveView()
   Tile();
 }
 
-
-#if USE_QT4
 // we use this wrapper for CompositeViewer ONLY because of the timer
 // NOTE: this is a workaround because we're not using QT's moc precompiler here.
 //
@@ -259,7 +242,6 @@ class QViewerTimer : public QWidget
         QTimer _timer;
 
 };
-#endif
 
 void setupHandlers(osgViewer::View * viewer)
 {

src/ui/map3D/QOSGWidget.h

@@ -19,31 +19,17 @@
 #include <osg/Config>
 
 #if defined(_MSC_VER) && defined(OSG_DISABLE_MSVC_WARNINGS)
-    // disable warning "'QtConcurrent::BlockSizeManager' : assignment operator could not be generated"
-    #pragma warning( disable : 4512 )
-#endif
-
-#if USE_QT4
-
-    #include <QtCore/QString>
-    #include <QtCore/QTimer>
-    #include <QtGui/QKeyEvent>
-    #include <QtGui/QApplication>
-    #include <QtGui/QtGui>
-    #include <QtGui/QWidget>
-    using Qt::WindowFlags;
-
-#else
-
-    class QWidget;
-    #include <qtimer.h>
-    #include <qgl.h>
-    #include <qapplication.h>
-
-    #define WindowFlags WFlags
-
+// disable warning "'QtConcurrent::BlockSizeManager' : assignment operator could not be generated"
+#pragma warning( disable : 4512 )
 #endif
 
+#include <QtCore/QString>
+#include <QtCore/QTimer>
+#include <QtGui/QKeyEvent>
+#include <QtGui/QApplication>
+#include <QtGui/QtGui>
+#include <QtGui/QWidget>
+using Qt::WindowFlags;
 
 #include <osgViewer/Viewer>
 #include <osgViewer/CompositeViewer>
@@ -85,7 +71,7 @@ typedef osgViewer::GraphicsWindowX11::WindowData WindowData;
 
 class QOSGWidget : public QWidget
 {
-    public:
+public:
 
     QOSGWidget( QWidget * parent = 0, const char * name = 0, WindowFlags f = 0, bool overrideTraits = false);
 
@@ -94,7 +80,7 @@ class QOSGWidget : public QWidget
     osgViewer::GraphicsWindow* getGraphicsWindow() { return _gw.get(); }
     const osgViewer::GraphicsWindow* getGraphicsWindow() const { return _gw.get(); }
 
-    protected:
+protected:
 
     void init();
     void createContext();
@@ -119,7 +105,7 @@ class QOSGWidget : public QWidget
 
 class ViewerQOSG : public osgViewer::Viewer, public QOSGWidget
 {
-    public:
+public:
 
     ViewerQOSG(QWidget * parent = 0, const char * name = 0, WindowFlags f = 0, int fps = 20):
             QOSGWidget( parent, name, f )
@@ -139,7 +125,7 @@ class ViewerQOSG : public osgViewer::Viewer, public QOSGWidget
 
     virtual void paintEvent( QPaintEvent * event ) { frame(); }
 
-    protected:
+protected:
 
     QTimer _timer;
 };
@@ -147,7 +133,7 @@ class ViewerQOSG : public osgViewer::Viewer, public QOSGWidget
 
 class CompositeViewerQOSG : public osgViewer::CompositeViewer, public QOSGWidget
 {
-    public:
+public:
     CompositeViewerQOSG(QWidget * parent = 0, const char * name = 0, WindowFlags f = 0, int fps = 20)
         : QOSGWidget( parent, name, f )
     {
@@ -196,7 +182,7 @@ class CompositeViewerQOSG : public osgViewer::CompositeViewer, public QOSGWidget
 
     osg::ref_ptr< osg::Node > _scene;
 
-    protected:
+protected:
     QTimer _timer;
 };
 

src/ui/map3D/Texture.cc

+/*=====================================================================
+
+QGroundControl Open Source Ground Control Station
+
+(c) 2009, 2010 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+
+This file is part of the QGROUNDCONTROL project
+
+    QGROUNDCONTROL is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    QGROUNDCONTROL is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with QGROUNDCONTROL. If not, see <http://www.gnu.org/licenses/>.
+
+======================================================================*/
+
+/**
+ * @file
+ *   @brief Definition of the class Texture.
+ *
+ *   @author Lionel Heng <hengli@student.ethz.ch>
+ *
+ */
+
+#include <osg/LineWidth>
+
+#include "Texture.h"
+
+Texture::Texture()
+    : _is3D(false)
+{
+    texture2D->setFilter(osg::Texture::MIN_FILTER, osg::Texture::NEAREST);
+    texture2D->setFilter(osg::Texture::MAG_FILTER, osg::Texture::NEAREST);
+    GLuint id;
+    glGenTextures(1, &id);
+    t->setID(id);
+    glBindTexture(GL_TEXTURE_2D, id);
+    glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+}
+
+const QString&
+Texture::getSourceURL(void) const
+{
+    return sourceURL;
+}
+
+void
+Texture::setId(unsigned int _id)
+{
+    id = _id;
+}
+
+void
+Texture::sync(const WebImagePtr& image)
+{
+    state = static_cast<State>(image->getState());
+
+    if (image->getState() != WebImage::UNINITIALIZED &&
+        (sourceURL != image->getSourceURL() ||
+         _is3D != image->is3D()))
+    {
+        sourceURL = image->getSourceURL();
+        _is3D = image->is3D();
+    }
+
+    if (image->getState() == WebImage::READY && image->getSyncFlag())
+    {
+        image->setSyncFlag(false);
+
+        if (image->getWidth() != imageWidth ||
+            image->getHeight() != imageHeight)
+        {
+            imageWidth = image->getWidth();
+            textureWidth = 32;
+            while (textureWidth < imageWidth)
+            {
+                textureWidth *= 2;
+            }
+            imageHeight = image->getHeight();
+            textureHeight = 32;
+            while (textureHeight < imageHeight)
+            {
+                textureHeight *= 2;
+            }
+
+            maxU = static_cast<double>(imageWidth)
+                   / static_cast<double>(textureWidth);
+            maxV = static_cast<double>(imageHeight)
+                   / static_cast<double>(textureHeight);
+
+            osg::ref_ptr<osg::Image> image;
+            image->setImage(textureWidth, textureHeight, 8, 3, GL_RGBA, GL_UNSIGNED_BYTES, NULL, osg::Image::USE_NEW_DELETE);
+
+            texture2D->
+            glBindTexture(GL_TEXTURE_2D, id);
+            glTexImage2D(GL_TEXTURE_2D, 0, 3, textureWidth, textureHeight,
+                         0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
+        }
+
+        glBindTexture(GL_TEXTURE_2D, id);
+        glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, imageWidth, imageHeight,
+                        GL_RGBA, GL_UNSIGNED_BYTE, image->getImageData());
+
+        heightModel = image->getHeightModel();
+    }
+}
+
+osg::ref_ptr<osg::Geometry>
+Texture::draw(float x1, float y1, float x2, float y2,
+              bool smoothInterpolation) const
+{
+    return draw(x1, y1, x2, y1, x2, y2, x1, y2, smoothInterpolation);
+}
+
+osg::ref_ptr<osg::Geometry>
+Texture::draw(float x1, float y1, float x2, float y2,
+              float x3, float y3, float x4, float y4,
+              bool smoothInterpolation) const
+{
+    osg::ref_ptr<osg::Geometry> geometry(new osg::Geometry);
+    osg::ref_ptr<osg::StateSet> stateset(new osg::StateSet);
+
+    if (state == REQUESTED)
+    {
+        osg::ref_ptr<osg::Vec2Array> vertices(new osg::Vec2Array);
+        vertices->push_back(osg::Vec2(x1, y1));
+        vertices->push_back(osg::Vec2(x2, y2));
+        vertices->push_back(osg::Vec2(x3, y3));
+        vertices->push_back(osg::Vec2(x4, y4));
+
+        geometry->addPrimitiveSet(new osg::DrawArrays(osg::PrimitiveSet::LINES,
+                                                      0, vertices->size()));
+
+        geometry->setVertexArray(vertices);
+
+        osg::ref_ptr<osg::Vec4Array> color(new osg::Vec4Array);
+        color->push_back(osg::Vec4(0.0f, 0.0f, 1.0f, 1.0f));
+        geometry->setColorArray(color);
+        geometry->setColorBinding(osg::Geometry::BIND_OVERALL);
+        
+        return geometry;
+    }
+
+    stateset->setTextureAttributeAndModes(id, texture2D);
+
+    float dx, dy;
+    if (smoothInterpolation)
+    {
+        texture2D->setFilter(osg::Texture::MIN_FILTER, osg::Texture::LINEAR);
+        texture2D->setFilter(osg::Texture::MAG_FILTER, osg::Texture::LINEAR);
+        dx = 1.0f / (2.0f * textureWidth);
+        dy = 1.0f / (2.0f * textureHeight);
+    }
+    else
+    {
+        texture2D->setFilter(osg::Texture::MIN_FILTER, osg::Texture::NEAREST);
+        texture2D->setFilter(osg::Texture::MAG_FILTER, osg::Texture::NEAREST);
+        dx = 0.0f;
+        dy = 0.0f;
+    }
+
+    glColor3f(1.0f, 1.0f, 1.0f);
+    if (!_is3D)
+    {
+        osg::ref_ptr<osg::Vec2Array> tc = new osg::Vec2Array;
+
+        geometry->setTexCoordArray(id, tc);
+        tc->push_back(osg::Vec2(dx, maxV - dy));
+        tc->push_back(osg::Vec2(maxU - dx, maxV - dy));
+        tc->push_back(osg::Vec2(maxU - dx, dy));
+        tc->push_back(osg::Vec2(dx, dy));
+
+        glBegin(GL_QUADS);
+        glTexCoord2f(dx, maxV - dy);
+        glVertex3f(x1, y1, 0.0f);
+        glTexCoord2f(maxU - dx, maxV - dy);
+        glVertex3f(x2, y2, 0.0f);
+        glTexCoord2f(maxU - dx, dy);
+        glVertex3f(x3, y3, 0.0f);
+        glTexCoord2f(dx, dy);
+        glVertex3f(x4, y4, 0.0f);
+        glEnd();
+    }
+    else
+    {
+        float scaleX = 1.0f / static_cast<float>(heightModel.size() - 1);
+
+        for (int32_t i = 0; i < heightModel.size() - 1; ++i)
+        {
+            float scaleI = scaleX * static_cast<float>(i);
+
+            float scaleY =
+                    1.0f / static_cast<float>(heightModel[i].size() - 1);
+
+            float x1i = x1 + scaleI * (x4 - x1);
+            float x1f = x2 + scaleI * (x3 - x2);
+            float x2i = x1i + scaleX * (x4 - x1);
+            float x2f = x1f + scaleX * (x3 - x2);
+
+            for (int32_t j = 0; j < heightModel[i].size() - 1; ++j)
+            {
+                float scaleJ = scaleY * static_cast<float>(j);
+
+                float y1i = y1 + scaleJ * (y2 - y1);
+                float y1f = y4 + scaleJ * (y3 - y4);
+                float y2i = y1i + scaleY * (y2 - y1);
+                float y2f = y1f + scaleY * (y3 - y4);
+
+                float nx1 = x1i + scaleJ * (x1f - x1i);
+                float nx2 = x1i + (scaleJ + scaleY) * (x1f - x1i);
+                float nx3 = x2i + (scaleJ + scaleY) * (x2f - x2i);
+                float nx4  = x2i + scaleJ * (x2f - x2i);
+                float ny1 = y1i + scaleI * (y1f - y1i);
+                float ny2 = y2i + scaleI * (y2f - y2i);
+                float ny3 = y2i + (scaleI + scaleX) * (y2f - y2i);
+                float ny4 = y1i + (scaleI + scaleX) * (y1f - y1i);
+
+                glBegin(GL_QUADS);
+                glTexCoord2f(dx + scaleJ * (maxU - dx * 2.0f),
+                             dy + (1.0f - scaleI) * (maxV - dy * 2.0f));
+                glVertex3f(nx1, ny1, -static_cast<float>(heightModel[i][j]));
+                glTexCoord2f(dx + (scaleJ + scaleY) * (maxU - dx * 2.0f),
+                             dy + (1.0f - scaleI) * (maxV - dy * 2.0f));
+                glVertex3f(nx2, ny2, -static_cast<float>(heightModel[i][j + 1]));
+                glTexCoord2f(dx + (scaleJ + scaleY) * (maxU - dx * 2.0f),
+                             dy + (1.0f - scaleI - scaleX) * (maxV - dy * 2.0f));
+                glVertex3f(nx3, ny3, -static_cast<float>(heightModel[i + 1][j + 1]));
+                glTexCoord2f(dx + scaleJ * (maxU - dx * 2.0f),
+                             dy + (1.0f - scaleI - scaleX) * (maxV - dy * 2.0f));
+                glVertex3f(nx4, ny4, -static_cast<float>(heightModel[i + 1][j]));
+
+                glEnd();
+            }
+        }
+    }
+}
+
+bool
+Texture::is3D(void) const
+{
+    return _is3D;
+}

src/ui/map3D/Texture.h

+/*=====================================================================
+
+QGroundControl Open Source Ground Control Station
+
+(c) 2009, 2010 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+
+This file is part of the QGROUNDCONTROL project
+
+    QGROUNDCONTROL is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    QGROUNDCONTROL is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with QGROUNDCONTROL. If not, see <http://www.gnu.org/licenses/>.
+
+======================================================================*/
+
+/**
+ * @file
+ *   @brief Definition of the class Texture.
+ *
+ *   @author Lionel Heng <hengli@student.ethz.ch>
+ *
+ */
+
+#ifndef TEXTURE_H
+#define TEXTURE_H
+
+#if (defined __APPLE__) & (defined __MACH__)
+#include <OpenGL/gl.h>
+#else
+#include <GL/gl.h>
+#endif
+#include <inttypes.h>
+#include <osg/ref_ptr>
+#include <osg/Geometry>
+#include <QSharedPointer>
+
+#include "WebImage.h"
+
+class Texture
+{
+public:
+    Texture();
+
+    const QString& getSourceURL(void) const;
+
+    void setId(unsigned int _id);
+
+    void sync(const WebImagePtr& image);
+
+    osg::ref_ptr<osg::Geometry> draw(float x1, float y1, float x2, float y2,
+                                     bool smoothInterpolation) const;
+    osg::ref_ptr<osg::Geometry> draw(float x1, float y1, float x2, float y2,
+                                     float x3, float y3, float x4, float y4,
+                                     bool smoothInterpolation) const;
+
+    bool is3D(void) const;
+
+private:
+    enum State
+    {
+        UNINITIALIZED = 0,
+        REQUESTED = 1,
+        READY = 2
+    };
+
+    State state;
+    QString sourceURL;
+    unsigned int id;
+    osg::ref_ptr<osg::Texture2D> texture2D;
+
+    int32_t textureWidth;
+    int32_t textureHeight;
+
+    int32_t imageWidth;
+    int32_t imageHeight;
+
+    bool _is3D;
+    QVector< QVector<int32_t> > heightModel;
+
+    float maxU;
+    float maxV;
+};
+
+typedef QSharedPointer<Texture> TexturePtr;
+
+#endif // TEXTURE_H

src/ui/map3D/TextureCache.cc

+/*=====================================================================
+
+QGroundControl Open Source Ground Control Station
+
+(c) 2009, 2010 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+
+This file is part of the QGROUNDCONTROL project
+
+    QGROUNDCONTROL is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    QGROUNDCONTROL is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with QGROUNDCONTROL. If not, see <http://www.gnu.org/licenses/>.
+
+======================================================================*/
+
+/**
+ * @file
+ *   @brief Definition of the class TextureCache.
+ *
+ *   @author Lionel Heng <hengli@student.ethz.ch>
+ *
+ */
+
+#include "TextureCache.h"
+
+TextureCache::TextureCache(uint32_t _cacheSize)
+    : cacheSize(_cacheSize)
+    , imageCache(new WebImageCache(0, cacheSize))
+{
+    for (uint32_t i = 0; i < cacheSize; ++i)
+    {
+        TexturePtr t(new Texture);
+        t->setId(i);
+
+        textures.push_back(t);
+    }
+}
+
+TexturePtr
+TextureCache::get(const QString& tileURL, bool useHeightModel)
+{
+    QPair<TexturePtr, int32_t> p1 = lookup(tileURL, useHeightModel);
+    if (!p1.first.isNull())
+    {
+        return p1.first;
+    }
+
+    QPair<WebImagePtr, int32_t> p2 =
+            imageCache->lookup(tileURL, useHeightModel);
+    if (!p2.first.isNull())
+    {
+        textures[p2.second]->sync(p2.first);
+        p1 = lookup(tileURL, useHeightModel);
+
+        return p1.first;
+    }
+
+    return TexturePtr();
+}
+
+void
+TextureCache::sync(void)
+{
+    if (requireSync())
+    {
+        for (int32_t i = 0; i < textures.size(); ++i)
+        {
+            textures[i]->sync(imageCache->at(i));
+        }
+    }
+}
+
+QPair<TexturePtr, int32_t>
+TextureCache::lookup(const QString& tileURL, bool useHeightModel)
+{
+    for (int32_t i = 0; i < textures.size(); ++i)
+    {
+        if (textures[i]->getSourceURL() == tileURL &&
+            textures[i]->is3D() == useHeightModel)
+        {
+            return qMakePair(textures[i], i);
+        }
+    }
+
+    return qMakePair(TexturePtr(), -1);
+}
+
+bool
+TextureCache::requireSync(void) const
+{
+    for (uint32_t i = 0; i < cacheSize; ++i)
+    {
+        if (imageCache->at(i)->getSyncFlag())
+        {
+            return true;
+        }
+    }
+    return false;
+}

src/ui/map3D/TextureCache.h

+/*=====================================================================
+
+QGroundControl Open Source Ground Control Station
+
+(c) 2009, 2010 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+
+This file is part of the QGROUNDCONTROL project
+
+    QGROUNDCONTROL is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    QGROUNDCONTROL is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with QGROUNDCONTROL. If not, see <http://www.gnu.org/licenses/>.
+
+======================================================================*/
+
+/**
+ * @file
+ *   @brief Definition of the class TextureCache.
+ *
+ *   @author Lionel Heng <hengli@student.ethz.ch>
+ *
+ */
+
+#ifndef TEXTURECACHE_H
+#define TEXTURECACHE_H
+
+#include <QVector>
+
+#include "Texture.h"
+#include "WebImageCache.h"
+
+class TextureCache
+{
+public:
+    explicit TextureCache(uint32_t cacheSize);
+
+    TexturePtr get(const QString& tileURL, bool useHeightModel = false);
+
+    void sync(void);
+
+private:
+    QPair<TexturePtr, int32_t> lookup(const QString& tileURL,
+                                      bool useHeightModel);
+
+    bool requireSync(void) const;
+
+    uint32_t cacheSize;
+    QVector<TexturePtr> textures;
+
+    QScopedPointer<WebImageCache> imageCache;
+};
+
+#endif // TEXTURECACHE_H

src/ui/map3D/WebImage.cc

+/*=====================================================================
+
+QGroundControl Open Source Ground Control Station
+
+(c) 2009, 2010 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+
+This file is part of the QGROUNDCONTROL project
+
+    QGROUNDCONTROL is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    QGROUNDCONTROL is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with QGROUNDCONTROL. If not, see <http://www.gnu.org/licenses/>.
+
+======================================================================*/
+
+/**
+ * @file
+ *   @brief Definition of the class WebImage.
+ *
+ *   @author Lionel Heng <hengli@student.ethz.ch>
+ *
+ */
+
+#include "WebImage.h"
+
+#include <QFile>
+#include <QGLWidget>
+
+WebImage::WebImage()
+    : state(WebImage::UNINITIALIZED)
+    , sourceURL("")
+    , image(0)
+    , lastReference(0)
+    , _is3D(false)
+    , syncFlag(false)
+{
+
+}
+
+void
+WebImage::clear(void)
+{
+    image.reset();
+    sourceURL.clear();
+    state = WebImage::UNINITIALIZED;
+    lastReference = 0;
+    heightModel.clear();
+}
+
+WebImage::State
+WebImage::getState(void) const
+{
+    return state;
+}
+
+void
+WebImage::setState(State state)
+{
+    this->state = state;
+}
+
+const QString&
+WebImage::getSourceURL(void) const
+{
+    return sourceURL;
+}
+
+void
+WebImage::setSourceURL(const QString& url)
+{
+    sourceURL = url;
+}
+
+const uint8_t*
+WebImage::getImageData(void) const
+{
+    return image->scanLine(0);
+}
+
+const QVector< QVector<int32_t> >&
+WebImage::getHeightModel(void) const
+{
+    return heightModel;
+}
+
+bool
+WebImage::setData(const QByteArray& data)
+{
+    QImage tempImage;
+    if (tempImage.loadFromData(data))
+    {
+        if (image.isNull())
+        {
+            image.reset(new QImage);
+        }
+        *image = QGLWidget::convertToGLFormat(tempImage);
+
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+bool
+WebImage::setData(const QString& filename)
+{
+    QImage tempImage;
+    if (tempImage.load(filename))
+    {
+        if (image.isNull())
+        {
+            image.reset(new QImage);
+        }
+        *image = QGLWidget::convertToGLFormat(tempImage);
+
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+bool
+WebImage::setData(const QString& imageFilename, const QString& heightFilename)
+{
+    QFile heightFile(heightFilename);
+
+    QImage tempImage;
+    if (tempImage.load(imageFilename) && heightFile.open(QIODevice::ReadOnly))
+    {
+        if (image.isNull())
+        {
+            image.reset(new QImage);
+        }
+        *image = QGLWidget::convertToGLFormat(tempImage);
+
+        QDataStream heightDataStream(&heightFile);
+
+        // read in width and height values for height map
+        char header[8];
+        heightDataStream.readRawData(header, 8);
+
+        int32_t height = *(reinterpret_cast<int32_t *>(header));
+        int32_t width = *(reinterpret_cast<int32_t *>(header + 4));
+
+        char buffer[height * width * sizeof(int32_t)];
+        heightDataStream.readRawData(buffer, height * width * sizeof(int32_t));
+
+        heightModel.clear();
+        for (int32_t i = 0; i < height; ++i)
+        {
+            QVector<int32_t> scanline;
+            for (int32_t j = 0; j < width; ++j)
+            {    
+                int32_t n = *(reinterpret_cast<int32_t *>(buffer
+                                                          + (i * height + j)
+                                                          * sizeof(int32_t)));
+                scanline.push_back(n);
+            }
+            heightModel.push_back(scanline);
+        }
+
+        heightFile.close();
+
+        _is3D = true;
+
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+int32_t
+WebImage::getWidth(void) const
+{
+    return image->width();
+}
+
+int32_t
+WebImage::getHeight(void) const
+{
+    return image->height();
+}
+
+int32_t
+WebImage::getByteCount(void) const
+{
+    return image->byteCount();
+}
+
+bool
+WebImage::is3D(void) const
+{
+    return _is3D;
+}
+
+uint64_t
+WebImage::getLastReference(void) const
+{
+    return lastReference;
+}
+
+void
+WebImage::setLastReference(uint64_t value)
+{
+    lastReference = value;
+}
+
+bool
+WebImage::getSyncFlag(void) const
+{
+    return syncFlag;
+}
+
+void
+WebImage::setSyncFlag(bool onoff)
+{
+    syncFlag = onoff;
+}

src/ui/map3D/WebImage.h

+/*=====================================================================
+
+QGroundControl Open Source Ground Control Station
+
+(c) 2009, 2010 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+
+This file is part of the QGROUNDCONTROL project
+
+    QGROUNDCONTROL is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    QGROUNDCONTROL is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with QGROUNDCONTROL. If not, see <http://www.gnu.org/licenses/>.
+
+======================================================================*/
+
+/**
+ * @file
+ *   @brief Definition of the class WebImage.
+ *
+ *   @author Lionel Heng <hengli@student.ethz.ch>
+ *
+ */
+
+#ifndef WEBIMAGE_H
+#define WEBIMAGE_H
+
+#include <inttypes.h>
+#include <QImage>
+#include <QScopedPointer>
+#include <QSharedPointer>
+
+class WebImage
+{
+public:
+    WebImage();
+
+    void clear(void);
+
+    enum State
+    {
+        UNINITIALIZED = 0,
+        REQUESTED = 1,
+        READY = 2
+    };
+
+    State getState(void) const;
+    void setState(State state);
+
+    const QString& getSourceURL(void) const;
+    void setSourceURL(const QString& url);
+
+    const uint8_t* getImageData(void) const;
+    const QVector< QVector<int32_t> >& getHeightModel(void) const;
+    bool setData(const QByteArray& data);
+    bool setData(const QString& filename);
+    bool setData(const QString& imageFilename, const QString& heightFilename);
+
+    int32_t getWidth(void) const;
+    int32_t getHeight(void) const;
+    int32_t getByteCount(void) const;
+
+    bool is3D(void) const;
+
+    uint64_t getLastReference(void) const;
+    void setLastReference(uint64_t value);
+
+    bool getSyncFlag(void) const;
+    void setSyncFlag(bool onoff);
+
+private:
+    State state;
+    QString sourceURL;
+    QScopedPointer<QImage> image;
+    QVector< QVector<int32_t> > heightModel;
+    uint64_t lastReference;
+    bool _is3D;
+    bool syncFlag;
+};
+
+typedef QSharedPointer<WebImage> WebImagePtr;
+
+#endif // WEBIMAGE_H

src/ui/map3D/WebImageCache.cc

+/*=====================================================================
+
+QGroundControl Open Source Ground Control Station
+
+(c) 2009, 2010 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+
+This file is part of the QGROUNDCONTROL project
+
+    QGROUNDCONTROL is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    QGROUNDCONTROL is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with QGROUNDCONTROL. If not, see <http://www.gnu.org/licenses/>.
+
+======================================================================*/
+
+/**
+ * @file
+ *   @brief Definition of the class WebImageCache.
+ *
+ *   @author Lionel Heng <hengli@student.ethz.ch>
+ *
+ */
+
+#include "WebImageCache.h"
+
+#include <QNetworkReply>
+#include <QPixmap>
+
+WebImageCache::WebImageCache(QObject* parent, uint32_t _cacheSize)
+    : QObject(parent)
+    , cacheSize(_cacheSize)
+    , currentReference(0)
+    , networkManager(new QNetworkAccessManager)
+{
+    for (uint32_t i = 0; i < cacheSize; ++i)
+    {
+        WebImagePtr image(new WebImage);
+
+        webImages.push_back(image);
+    }
+
+    connect(networkManager.data(), SIGNAL(finished(QNetworkReply*)),
+            this, SLOT(downloadFinished(QNetworkReply*)));
+}
+
+QPair<WebImagePtr, int32_t>
+WebImageCache::lookup(const QString& url, bool useHeightModel)
+{
+    QPair<WebImagePtr, int32_t> cacheEntry;
+
+    for (int32_t i = 0; i < webImages.size(); ++i)
+    {
+        if (webImages[i]->getState() != WebImage::UNINITIALIZED &&
+            webImages[i]->getSourceURL() == url &&
+            webImages[i]->is3D() == useHeightModel)
+        {
+            cacheEntry.first = webImages[i];
+            cacheEntry.second = i;
+            break;
+        }
+    }
+
+    if (cacheEntry.first.isNull())
+    {
+        for (int32_t i = 0; i < webImages.size(); ++i)
+        {
+            // get uninitialized image
+            if (webImages[i]->getState() == WebImage::UNINITIALIZED)
+            {
+                cacheEntry.first = webImages[i];
+                cacheEntry.second = i;
+                break;
+            }
+            // get oldest image
+            else if (webImages[i]->getState() == WebImage::READY &&
+                     (cacheEntry.first.isNull() ||
+                      webImages[i]->getLastReference() <
+                      cacheEntry.first->getLastReference()))
+            {
+                cacheEntry.first = webImages[i];
+                cacheEntry.second = i;
+            }
+        }
+
+        if (cacheEntry.first.isNull())
+        {
+            return qMakePair(WebImagePtr(), -1);
+        }
+        else
+        {
+            if (cacheEntry.first->getState() == WebImage::READY)
+            {
+                cacheEntry.first->clear();
+            }
+            cacheEntry.first->setSourceURL(url);
+            cacheEntry.first->setLastReference(currentReference);
+            ++currentReference;
+            cacheEntry.first->setState(WebImage::REQUESTED);
+
+            if (url.left(4).compare("http") == 0)
+            {
+                networkManager->get(QNetworkRequest(QUrl(url)));
+            }
+            else
+            {
+                bool success;
+
+                if (useHeightModel)
+                {
+                    QString heightURL = url;
+                    heightURL.replace("color", "dom");
+                    heightURL.replace(".jpg", ".txt");
+
+                    success = cacheEntry.first->setData(url, heightURL);
+                }
+                else
+                {
+                    success = cacheEntry.first->setData(url);
+                }
+
+                if (success)
+                {
+                    cacheEntry.first->setSyncFlag(true);
+                    cacheEntry.first->setState(WebImage::READY);
+                }
+                else
+                {
+                    cacheEntry.first->setState(WebImage::UNINITIALIZED);
+                }
+            }
+
+            return cacheEntry;
+        }
+    }
+    else
+    {
+        if (cacheEntry.first->getState() == WebImage::READY)
+        {
+            cacheEntry.first->setLastReference(currentReference);
+            ++currentReference;
+            return cacheEntry;
+        }
+        else
+        {
+            return qMakePair(WebImagePtr(), -1);
+        }
+    }
+}
+
+WebImagePtr
+WebImageCache::at(int32_t index) const
+{
+    return webImages[index];
+}
+
+void
+WebImageCache::downloadFinished(QNetworkReply* reply)
+{
+    reply->deleteLater();
+
+    if (reply->error() != QNetworkReply::NoError)
+    {
+        return;
+    }
+    QVariant attribute = reply->attribute(QNetworkRequest::RedirectionTargetAttribute);
+    if (attribute.isValid())
+    {
+        return;
+    }
+
+    WebImagePtr image;
+    foreach(image, webImages)
+    {
+        if (reply->url().toString() == image->getSourceURL())
+        {
+            image->setData(reply->readAll());
+            image->setSyncFlag(true);
+            image->setState(WebImage::READY);
+
+            return;
+        }
+    }
+}

src/ui/map3D/WebImageCache.h

+/*=====================================================================
+
+QGroundControl Open Source Ground Control Station
+
+(c) 2009, 2010 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+
+This file is part of the QGROUNDCONTROL project
+
+    QGROUNDCONTROL is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    QGROUNDCONTROL is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with QGROUNDCONTROL. If not, see <http://www.gnu.org/licenses/>.
+
+======================================================================*/
+
+/**
+ * @file
+ *   @brief Definition of the class WebImageCache.
+ *
+ *   @author Lionel Heng <hengli@student.ethz.ch>
+ *
+ */
+
+#ifndef WEBIMAGECACHE_H
+#define WEBIMAGECACHE_H
+
+#include <QNetworkAccessManager>
+#include <QObject>
+#include <QPair>
+
+#include "WebImage.h"
+
+class WebImageCache : public QObject
+{
+    Q_OBJECT
+
+public:
+    WebImageCache(QObject* parent, uint32_t cacheSize);
+
+    QPair<WebImagePtr, int32_t> lookup(const QString& url,
+                                       bool useHeightModel);
+
+    WebImagePtr at(int32_t index) const;
+
+private Q_SLOTS:
+    void downloadFinished(QNetworkReply* reply);
+
+private:
+    uint32_t cacheSize;
+
+    QVector<WebImagePtr> webImages;
+    uint64_t currentReference;
+
+    QScopedPointer<QNetworkAccessManager> networkManager;
+};
+
+#endif // WEBIMAGECACHE_H