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
1c61eec8
Commit
1c61eec8
authored
Dec 14, 2010
by
James Goppert
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed build for linux.
parent
18b0e07e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
4 deletions
+5
-4
qgroundcontrol.pri
qgroundcontrol.pri
+1
-0
GCManipulator.cc
src/ui/map3D/GCManipulator.cc
+3
-3
QMap3D.cc
src/ui/map3D/QMap3D.cc
+1
-1
No files found.
qgroundcontrol.pri
View file @
1c61eec8
...
@@ -158,6 +158,7 @@ linux-g++ {
...
@@ -158,6 +158,7 @@ linux-g++ {
QMAKE_POST_LINK += cp -rf $$BASEDIR/audio $$DESTDIR/.
QMAKE_POST_LINK += cp -rf $$BASEDIR/audio $$DESTDIR/.
INCLUDEPATH += /usr/include \
INCLUDEPATH += /usr/include \
/usr/local/include \
/usr/include/qt4/phonon
/usr/include/qt4/phonon
# $$BASEDIR/lib/flite/include \
# $$BASEDIR/lib/flite/include \
# $$BASEDIR/lib/flite/lang
# $$BASEDIR/lib/flite/lang
...
...
src/ui/map3D/GCManipulator.cc
View file @
1c61eec8
...
@@ -254,10 +254,10 @@ GCManipulator::calcMovement(void)
...
@@ -254,10 +254,10 @@ GCManipulator::calcMovement(void)
if
(
buttonMask
==
GUIEventAdapter
::
LEFT_MOUSE_BUTTON
)
if
(
buttonMask
==
GUIEventAdapter
::
LEFT_MOUSE_BUTTON
)
{
{
// rotate camera
// rotate camera
#ifdef __APPLE__
#ifdef __WIN32__
osg
::
Vec3d
axis
;
#else
osg
::
Vec3
axis
;
osg
::
Vec3
axis
;
#else
osg
::
Vec3d
axis
;
#endif
#endif
float
angle
;
float
angle
;
...
...
src/ui/map3D/QMap3D.cc
View file @
1c61eec8
...
@@ -39,7 +39,7 @@ QMap3D::QMap3D(QWidget * parent, const char * name, WindowFlags f) :
...
@@ -39,7 +39,7 @@ QMap3D::QMap3D(QWidget * parent, const char * name, WindowFlags f) :
QWidget
(
parent
,
f
)
QWidget
(
parent
,
f
)
{
{
setupUi
(
this
);
setupUi
(
this
);
graphicsView
->
setCameraManipulator
(
new
osgEarthUtil
::
EarthManipulator
);
graphicsView
->
setCameraManipulator
(
new
osgEarth
::
Util
::
EarthManipulator
);
graphicsView
->
setSceneData
(
new
osg
::
Group
);
graphicsView
->
setSceneData
(
new
osg
::
Group
);
graphicsView
->
updateCamera
();
graphicsView
->
updateCamera
();
show
();
show
();
...
...
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