some refactoring

hopefully improved rendering speed
added support to add .obj obstacles
This commit is contained in:
2018-02-17 17:39:18 +01:00
parent 839401edb7
commit 52ab71fac5
25 changed files with 538 additions and 12 deletions

View File

@@ -0,0 +1,51 @@
#ifndef MV2DELEMENTFLOOROBSTACLEOBJECT_H
#define MV2DELEMENTFLOOROBSTACLEOBJECT_H
#include "MV2DElement.h"
#include "HasMoveableNodes.h"
//#include "MapViewElementHelper.h"
#include <Indoor/floorplan/v2/Floorplan.h>
//#include <stdio.h>
//#include "../../UIHelper.h"
class MV2DElementFloorObstacleObject : public MV2DElement, public HasMoveableNodes {
private:
//bool sel = false;
Floorplan::FloorObstacleObject* fo;
public:
/** ctor with the AP to render/edit */
MV2DElementFloorObstacleObject(Floorplan::FloorObstacleObject* fo);
BBox2 getBoundingBox() const override;
/** get the element's minimal distance (nearest whatsoever) to the given point */
ClickDist getMinDistanceXY(const Point2 p) const override;
/** repaint me */
void paint(Painter& p) override;
virtual std::vector<MoveableNode> getMoveableNodes() const override;
virtual void onNodeMove(MapView2D* v, const int userIdx, const Point2 newPos) override;
virtual void mousePressed(MapView2D* v, const Point2 p) override;
virtual void mouseMove(MapView2D* v, const Point2 p) override;
virtual void mouseReleased(MapView2D* v, const Point2 p) override;
virtual bool keyPressEvent(MapView2D* v, QKeyEvent *e) override;
virtual void onFocus() override;
virtual void onUnfocus() override;
};
#endif // MV2DELEMENTFLOOROBSTACLELINE_H