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
1fb0417c
Commit
1fb0417c
authored
Nov 15, 2010
by
Lionel Heng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed now redundant files for 3D view perspective.
parent
9bc4a88f
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
0 additions
and
60499 deletions
+0
-60499
CheetahGL.cc
src/ui/map3D/CheetahGL.cc
+0
-59381
CheetahGL.h
src/ui/map3D/CheetahGL.h
+0
-51
CheetahModel.cc
src/ui/map3D/CheetahModel.cc
+0
-55
CheetahModel.h
src/ui/map3D/CheetahModel.h
+0
-66
QMap3DWidget.cc
src/ui/map3D/QMap3DWidget.cc
+0
-819
QMap3DWidget.h
src/ui/map3D/QMap3DWidget.h
+0
-127
No files found.
src/ui/map3D/CheetahGL.cc
deleted
100755 → 0
View file @
9bc4a88f
This diff is collapsed.
Click to expand it.
src/ui/map3D/CheetahGL.h
deleted
100644 → 0
View file @
9bc4a88f
/*=====================================================================
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 Generates a display list which renders a Pixhawk Cheetah MAV.
*
* @author Lionel Heng <hengli@student.ethz.ch>
*
*/
#ifndef CHEETAHGL_H_
#define CHEETAHGL_H_
#if (defined __APPLE__) & (defined __MACH__)
#include <OpenGL/gl.h>
#else
#include <GL/gl.h>
#endif
/**
* @brief Creates a display list which renders a Pixhawk Cheetah MAV.
* @param red Red intensity of the MAV model
* @param green Green intensity of the MAV model
* @param blue Blue intensity of the MAV model
*
* @return The index of the display list.
**/
GLint
generatePixhawkCheetah
(
float
red
,
float
green
,
float
blue
);
#endif
src/ui/map3D/CheetahModel.cc
deleted
100644 → 0
View file @
9bc4a88f
/*=====================================================================
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 CheetahModel.
*
* @author Lionel Heng <hengli@student.ethz.ch>
*
*/
#include "CheetahModel.h"
#include "CheetahGL.h"
CheetahModel
::
CheetahModel
()
:
cheetah_dl
(
-
1
)
{
}
void
CheetahModel
::
init
(
float
red
,
float
green
,
float
blue
)
{
cheetah_dl
=
generatePixhawkCheetah
(
red
,
green
,
blue
);
}
void
CheetahModel
::
draw
(
void
)
{
glPushMatrix
();
glScalef
(
0.5
f
,
0.5
f
,
-
0.5
f
);
glCallList
(
cheetah_dl
);
glPopMatrix
();
}
src/ui/map3D/CheetahModel.h
deleted
100644 → 0
View file @
9bc4a88f
/*=====================================================================
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 CheetahModel.
*
* @author Lionel Heng <hengli@student.ethz.ch>
*
*/
#ifndef CHEETAHMODEL_H_
#define CHEETAHMODEL_H_
#if (defined __APPLE__) & (defined __MACH__)
#include <OpenGL/gl.h>
#else
#include <GL/gl.h>
#endif
/**
* @brief Container for display list which renders the Pixhawk Cheetah MAV.
**/
class
CheetahModel
{
public:
CheetahModel
();
/**
* @brief Initializes the display list.
* @param red Red intensity of the MAV model
* @param green Green intensity of the MAV model
* @param blue Blue intensity of the MAV model
**/
void
init
(
float
red
,
float
green
,
float
blue
);
/**
* @brief Executes the display list.
**/
void
draw
(
void
);
private:
GLint
cheetah_dl
;
};
#endif
/* CHEETAHMODEL_H_ */
src/ui/map3D/QMap3DWidget.cc
deleted
100644 → 0
View file @
9bc4a88f
This diff is collapsed.
Click to expand it.
src/ui/map3D/QMap3DWidget.h
deleted
100644 → 0
View file @
9bc4a88f
/*=====================================================================
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 QMap3DWidget.
*
* @author Lionel Heng <hengli@student.ethz.ch>
*
*/
#ifndef QMAP3DWIDGET_H
#define QMAP3DWIDGET_H
#include <QLabel>
#include "Imagery.h"
#include "Q3DWidget.h"
class
CheetahModel
;
class
UASInterface
;
/**
* @brief A 3D View widget which displays vehicle-centric information.
**/
class
QMap3DWidget
:
public
Q3DWidget
{
Q_OBJECT
public:
explicit
QMap3DWidget
(
QWidget
*
parent
);
~
QMap3DWidget
();
void
buildLayout
(
void
);
static
void
display
(
void
*
clientData
);
void
displayHandler
(
void
);
// void paintEvent(QPaintEvent *event);
static
void
mouse
(
Qt
::
MouseButton
button
,
MouseState
state
,
int32_t
x
,
int32_t
y
,
void
*
clientData
);
void
mouseHandler
(
Qt
::
MouseButton
button
,
MouseState
state
,
int32_t
x
,
int32_t
y
);
static
void
timer
(
void
*
clientData
);
void
timerHandler
(
void
);
double
getTime
(
void
)
const
;
public
slots
:
void
setActiveUAS
(
UASInterface
*
uas
);
void
markTarget
(
void
);
private
slots
:
void
showGrid
(
int
state
);
void
showTrail
(
int
state
);
void
showImagery
(
const
QString
&
text
);
void
recenterCamera
(
void
);
void
toggleLockCamera
(
int
state
);
protected:
UASInterface
*
uas
;
void
paintText
(
QString
text
,
QColor
color
,
float
fontSize
,
float
refX
,
float
refY
,
QPainter
*
painter
)
const
;
void
drawWaypoints
(
void
)
const
;
private:
void
drawPlatform
(
float
roll
,
float
pitch
,
float
yaw
)
const
;
void
drawGrid
(
float
x
,
float
y
,
float
z
)
const
;
void
drawImagery
(
double
originX
,
double
originY
,
double
originZ
,
const
QString
&
zone
,
bool
prefetch
)
const
;
void
drawTrail
(
float
x
,
float
y
,
float
z
);
void
drawTarget
(
float
x
,
float
y
,
float
z
)
const
;
void
drawLegend
(
void
);
double
lastRedrawTime
;
bool
displayGrid
;
bool
displayImagery
;
bool
displayTrail
;
typedef
struct
{
float
x
;
float
y
;
float
z
;
}
Pose3D
;
bool
lockCamera
;
Pose3D
lastUnlockedPose
;
bool
updateLastUnlockedPose
;
Pose3D
camOffset
;
QVarLengthArray
<
Pose3D
,
10000
>
trail
;
bool
displayTarget
;
bool
displayWaypoints
;
Pose3D
targetPosition
;
QScopedPointer
<
CheetahModel
>
cheetahModel
;
QScopedPointer
<
Imagery
>
imagery
;
QComboBox
*
imageryComboBox
;
};
#endif // QMAP3DWIDGET_H
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