added more cpp files for faster compile speeds
removed many obsolte elements many improvements and fixes
This commit is contained in:
@@ -16,7 +16,7 @@ MapView2D::MapView2D(QWidget* parent) : QOpenGLWidget(parent) {
|
||||
|
||||
// openGL params
|
||||
QSurfaceFormat format;
|
||||
format.setDepthBufferSize(24);
|
||||
format.setDepthBufferSize(8); // 24
|
||||
format.setStencilBufferSize(8);
|
||||
format.setSamples(1);
|
||||
// format.setVersion(3, 2);
|
||||
@@ -49,11 +49,19 @@ void MapView2D::paintGL() {
|
||||
// background tools
|
||||
tools.paintBefore(this, p);
|
||||
|
||||
// render all visible elements
|
||||
|
||||
qp.setRenderHint( QPainter::Antialiasing, true );
|
||||
|
||||
// render all visible elements. 1st run
|
||||
for (MapModelElement* el : getModel()->getVisibleElements()) {
|
||||
if (el->getMV2D()) {el->getMV2D()->paint(p);}
|
||||
}
|
||||
|
||||
// render all visible elements. 2nd run
|
||||
for (MapModelElement* el : getModel()->getVisibleElements()) {
|
||||
if (el->getMV2D()) {el->getMV2D()->paintAfter(p);}
|
||||
}
|
||||
|
||||
qp.setRenderHint( QPainter::Antialiasing, false );
|
||||
|
||||
// foreground tools
|
||||
@@ -68,7 +76,9 @@ void MapView2D::initializeGL() {
|
||||
|
||||
}
|
||||
|
||||
void MapView2D::resizeGL() {
|
||||
void MapView2D::resizeGL(int w, int h) {
|
||||
(void) w;
|
||||
(void) h;
|
||||
// TODO ?
|
||||
}
|
||||
|
||||
@@ -110,10 +120,12 @@ bool MapView2D::event(QEvent* event) {
|
||||
|
||||
bool MapView2D::gestureEvent(QGestureEvent* event) {
|
||||
if (QGesture *swipe = event->gesture(Qt::SwipeGesture)) {
|
||||
(void) swipe;
|
||||
//swipeTriggered(static_cast<QSwipeGesture *>(swipe));
|
||||
} else if (QGesture *pan = event->gesture(Qt::PanGesture))
|
||||
} else if (QGesture *pan = event->gesture(Qt::PanGesture)) {
|
||||
panTriggered(static_cast<QPanGesture *>(pan));
|
||||
return true;
|
||||
}
|
||||
if (QGesture *pinch = event->gesture(Qt::PinchGesture)) {
|
||||
pinchTriggered(static_cast<QPinchGesture *>(pinch));
|
||||
return true;
|
||||
|
||||
Reference in New Issue
Block a user