X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdrawingview.h;h=92ac72a692abc14945124569c45d8d6a699f66c4;hb=6533354910fbf76d9747deeae02b2e910ef9aa48;hp=5cbd53b8952411808ec7ebb9622d72251613df17;hpb=db0a3d91f37031e155cc8eac7cfdec9889f233ee;p=architektonas

diff --git a/src/drawingview.h b/src/drawingview.h
index 5cbd53b..92ac72a 100644
--- a/src/drawingview.h
+++ b/src/drawingview.h
@@ -3,10 +3,13 @@
 
 #include <QtWidgets>
 #include <stdint.h>
-//#include "action.h"
-//#include "container.h"
+#include "rect.h"
 #include "structs.h"
 
+enum { ToolMouseDown, ToolMouseMove, ToolMouseUp, ToolKeyDown, ToolKeyUp, ToolCleanup };
+
+class Painter;
+
 class DrawingView: public QWidget
 {
 	Q_OBJECT
@@ -15,15 +18,35 @@ class DrawingView: public QWidget
 		DrawingView(QWidget * parent = NULL);
 
 	public:
-//		void SetToolActive(Action * action);
 		void SetGridSize(uint32_t);
 		void UpdateGridBackground(void);
 		Point SnapPointToGrid(Point);
+		Point SnapPointToAngle(Point);
+		void RenderObjects(Painter *, std::vector<void *> &, int, bool ignoreLayer = false);
+		void AddHoveredToSelection(void);
+		void GetSelection(std::vector<void *> &);
+		void GetHovered(std::vector<void *> &);
+		void ToolHandler(int, Point);
+		void ToolDraw(Painter *);
+		void LineHandler(int, Point);
+		void CircleHandler(int, Point);
+		void ArcHandler(int, Point);
+		void RotateHandler(int, Point);
+		void MirrorHandler(int, Point);
+		Rect GetObjectExtents(Object *);
+		void CheckObjectBounds(void);
+		bool HitTestObjects(Point);
+		bool HitTest(Object *, Point);
+		bool HandleObjectClicked(void);
+		void HandleObjectMovement(Point);
 
 	public slots:
-		void AddNewObjectToDocument(Object *);
-		void HandleActionUpdate(void);
-		void SetCurrentLayer(int);
+		void DeleteCurrentLayer(int);
+		void HandleLayerToggle(void);
+		void HandleLayerSwap(int, int);
+
+	signals:
+		void ObjectHovered(Object *);
 
 	protected:
 		void paintEvent(QPaintEvent * event);
@@ -41,6 +64,10 @@ class DrawingView: public QWidget
 
 	public:
 		bool useAntialiasing;
+//		uint32_t numSelected;
+		uint32_t numHovered;
+		bool shiftDown;
+		bool ctrlDown;
 
 	private:
 		QPixmap gridBackground;
@@ -53,12 +80,21 @@ class DrawingView: public QWidget
 		bool collided;
 		bool scrollDrag;
 		Vector oldPoint;
+		QString informativeText;
 
 	public:
-//		Action * toolAction;
-
-//	public:
-//		static Container document;
+		std::vector<void *> select;
+		std::vector<void *> hover;
+		std::vector<void *> toolObjects;
+		std::vector<Object> toolScratch;
+		Point toolPoint[32];
+		Point intersectionPoint;
+		Point hoverPoint;
+		bool hoverPointValid;
+		bool hoveringIntersection;
+		Object * dragged;
+		bool draggingObject;
+		bool angleSnap;
 };
 
 #endif	// __DRAWINGVIEW_H__