Commit 2c289984 authored by pixhawk's avatar pixhawk

Working on Windows OSG support

parent 261dcf6e
This diff is collapsed.
...@@ -35,7 +35,7 @@ TEMPLATE = app ...@@ -35,7 +35,7 @@ TEMPLATE = app
TARGET = qgroundcontrol TARGET = qgroundcontrol
BASEDIR = $$IN_PWD BASEDIR = $$IN_PWD
TARGETDIR = $$OUT_PWD TARGETDIR = $$OUT_PWD
BUILDDIR = $$TARGET_DIR/build BUILDDIR = $$OUT_PWD/build
LANGUAGE = C++ LANGUAGE = C++
CONFIG += debug_and_release \ CONFIG += debug_and_release \
console console
......
...@@ -41,7 +41,7 @@ This file is part of the QGROUNDCONTROL project ...@@ -41,7 +41,7 @@ This file is part of the QGROUNDCONTROL project
#endif #endif
// Speech synthesis is only supported with MSVC compiler // Speech synthesis is only supported with MSVC compiler
#if _MSC_VER #if _MSC_VER2
// Documentation: http://msdn.microsoft.com/en-us/library/ee125082%28v=VS.85%29.aspx // Documentation: http://msdn.microsoft.com/en-us/library/ee125082%28v=VS.85%29.aspx
#define _ATL_APARTMENT_THREADED #define _ATL_APARTMENT_THREADED
...@@ -93,7 +93,7 @@ emergency(false) ...@@ -93,7 +93,7 @@ emergency(false)
flite_init(); flite_init();
#endif #endif
#if _MSC_VER #if _MSC_VER2
ISpVoice * pVoice = NULL; ISpVoice * pVoice = NULL;
if (FAILED(::CoInitialize(NULL))) if (FAILED(::CoInitialize(NULL)))
...@@ -134,7 +134,7 @@ emergency(false) ...@@ -134,7 +134,7 @@ emergency(false)
GAudioOutput::~GAudioOutput() GAudioOutput::~GAudioOutput()
{ {
#ifdef _MSC_VER #ifdef _MSC_VER2
::CoUninitialize(); ::CoUninitialize();
#endif #endif
} }
......
...@@ -316,7 +316,7 @@ Pixhawk3DWidget::createGrid(void) ...@@ -316,7 +316,7 @@ Pixhawk3DWidget::createGrid(void)
// draw a 20m x 20m grid with 0.25m resolution // draw a 20m x 20m grid with 0.25m resolution
for (float i = -radius; i <= radius; i += resolution) for (float i = -radius; i <= radius; i += resolution)
{ {
if (fabsf(i - roundf(i)) < 0.01f) if (fabsf(i - floor(i + 0.5f)) < 0.01f)
{ {
coarseCoords->push_back(osg::Vec3(i, -radius, 0.0f)); coarseCoords->push_back(osg::Vec3(i, -radius, 0.0f));
coarseCoords->push_back(osg::Vec3(i, radius, 0.0f)); coarseCoords->push_back(osg::Vec3(i, radius, 0.0f));
......
...@@ -33,7 +33,7 @@ This file is part of the QGROUNDCONTROL project ...@@ -33,7 +33,7 @@ This file is part of the QGROUNDCONTROL project
#define Q3DWIDGET_H #define Q3DWIDGET_H
#include <QtOpenGL> #include <QtOpenGL>
#include <inttypes.h>
#include <osg/LineSegment> #include <osg/LineSegment>
#include <osg/PositionAttitudeTransform> #include <osg/PositionAttitudeTransform>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment