Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
2c289984
Commit
2c289984
authored
Nov 27, 2010
by
pixhawk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Working on Windows OSG support
parent
261dcf6e
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
327 additions
and
300 deletions
+327
-300
qgroundcontrol.pri
qgroundcontrol.pri
+321
-294
qgroundcontrol.pro
qgroundcontrol.pro
+1
-1
GAudioOutput.cc
src/GAudioOutput.cc
+3
-3
Pixhawk3DWidget.cc
src/ui/map3D/Pixhawk3DWidget.cc
+1
-1
Q3DWidget.h
src/ui/map3D/Q3DWidget.h
+1
-1
No files found.
qgroundcontrol.pri
View file @
2c289984
This diff is collapsed.
Click to expand it.
qgroundcontrol.pro
View file @
2c289984
...
...
@@ -35,7 +35,7 @@ TEMPLATE = app
TARGET
=
qgroundcontrol
BASEDIR
=
$$
IN_PWD
TARGETDIR
=
$$
OUT_PWD
BUILDDIR
=
$$
TARGET_DIR
/
build
BUILDDIR
=
$$
OUT_PWD
/
build
LANGUAGE
=
C
++
CONFIG
+=
debug_and_release
\
console
...
...
src/GAudioOutput.cc
View file @
2c289984
...
...
@@ -41,7 +41,7 @@ This file is part of the QGROUNDCONTROL project
#endif
// Speech synthesis is only supported with MSVC compiler
#if _MSC_VER
#if _MSC_VER
2
// Documentation: http://msdn.microsoft.com/en-us/library/ee125082%28v=VS.85%29.aspx
#define _ATL_APARTMENT_THREADED
...
...
@@ -93,7 +93,7 @@ emergency(false)
flite_init
();
#endif
#if _MSC_VER
#if _MSC_VER
2
ISpVoice
*
pVoice
=
NULL
;
if
(
FAILED
(
::
CoInitialize
(
NULL
)))
...
...
@@ -134,7 +134,7 @@ emergency(false)
GAudioOutput
::~
GAudioOutput
()
{
#ifdef _MSC_VER
#ifdef _MSC_VER
2
::
CoUninitialize
();
#endif
}
...
...
src/ui/map3D/Pixhawk3DWidget.cc
View file @
2c289984
...
...
@@ -316,7 +316,7 @@ Pixhawk3DWidget::createGrid(void)
// draw a 20m x 20m grid with 0.25m resolution
for
(
float
i
=
-
radius
;
i
<=
radius
;
i
+=
resolution
)
{
if
(
fabsf
(
i
-
roundf
(
i
))
<
0.01
f
)
if
(
fabsf
(
i
-
floor
(
i
+
0.5
f
))
<
0.01
f
)
{
coarseCoords
->
push_back
(
osg
::
Vec3
(
i
,
-
radius
,
0.0
f
));
coarseCoords
->
push_back
(
osg
::
Vec3
(
i
,
radius
,
0.0
f
));
...
...
src/ui/map3D/Q3DWidget.h
View file @
2c289984
...
...
@@ -33,7 +33,7 @@ This file is part of the QGROUNDCONTROL project
#define Q3DWIDGET_H
#include <QtOpenGL>
#include <inttypes.h>
#include <osg/LineSegment>
#include <osg/PositionAttitudeTransform>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment