worked on 3D viz
scaling, moving by finger some fixes / improvement
This commit is contained in:
@@ -13,6 +13,8 @@ class GridModel;
|
||||
class GridRenderer;
|
||||
class NavMeshRenderer;
|
||||
class NavMeshModel;
|
||||
class FloorplanRenderer;
|
||||
class FloorplanRendererModel;
|
||||
|
||||
class MapView3D : public QOpenGLWidget {
|
||||
|
||||
@@ -30,13 +32,17 @@ public:
|
||||
update();
|
||||
}
|
||||
|
||||
void layerChange() {
|
||||
update();
|
||||
}
|
||||
/** redraw on layer change */
|
||||
void layerChange();
|
||||
|
||||
|
||||
/** get the underlying data-model */
|
||||
MapModel* getModel() {return model;}
|
||||
|
||||
|
||||
/** get the renderer to use for the floorplan */
|
||||
FloorplanRenderer* getFloorplanRenderer() {return floorplanRenderer;}
|
||||
|
||||
/** get the renderer to use for the grid */
|
||||
GridRenderer* getGridRenderer() {return gridRenderer;}
|
||||
|
||||
@@ -67,6 +73,9 @@ private:
|
||||
/** the underlying data-model */
|
||||
MapModel* model = nullptr;
|
||||
|
||||
FloorplanRenderer* floorplanRenderer = nullptr;
|
||||
FloorplanRendererModel* floorplanRendererModel = nullptr;
|
||||
|
||||
GridModel* gridModel = nullptr;
|
||||
GridRenderer* gridRenderer = nullptr;
|
||||
|
||||
@@ -104,6 +113,16 @@ protected:
|
||||
void mouseReleaseEvent(QMouseEvent* e);
|
||||
void wheelEvent(QWheelEvent* e);
|
||||
|
||||
// android
|
||||
bool event(QEvent *e) override;
|
||||
bool gestureEvent(QGestureEvent* event);
|
||||
void pinchTriggered(QPinchGesture* gesture);
|
||||
void panTriggered(QPanGesture* gesture);
|
||||
|
||||
private:
|
||||
|
||||
void moveXY(float dx, float dy);
|
||||
|
||||
signals:
|
||||
|
||||
void onShow3DFloorplan(bool show);
|
||||
|
||||
Reference in New Issue
Block a user