X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdrawingview.h;h=780c81214bf81c360bf53901478fb1421d390d6d;hb=e78daf62eb771ee29a59035d16cf63c1e6ebe144;hp=9095e53fa2e63cc97d1141ec73eca65790bb5dac;hpb=8fdd047c1ee3688f5538cae30e0acc98b96a2150;p=architektonas

diff --git a/src/drawingview.h b/src/drawingview.h
index 9095e53..780c812 100644
--- a/src/drawingview.h
+++ b/src/drawingview.h
@@ -3,8 +3,11 @@
 
 #include <QtWidgets>
 #include <stdint.h>
+#include "rect.h"
 #include "structs.h"
 
+enum { ToolMouseDown, ToolMouseMove, ToolMouseUp, ToolKeyDown, ToolKeyUp, ToolCleanup };
+
 class Painter;
 
 class DrawingView: public QWidget
@@ -18,20 +21,30 @@ class DrawingView: public QWidget
 		void SetGridSize(uint32_t);
 		void UpdateGridBackground(void);
 		Point SnapPointToGrid(Point);
-		void RenderObjects(Painter *, Container *);
-		void DeleteSelectedItems(void);
-		void ClearSelection(void);
+		void RenderObjects(Painter *, std::vector<void *> &, int, bool ignoreLayer = false);
 		void AddHoveredToSelection(void);
 		void GetSelection(std::vector<void *> &);
 		void GetHovered(std::vector<void *> &);
-		void ToolMouse(int, Point);
+		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);
+		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);
@@ -49,7 +62,7 @@ class DrawingView: public QWidget
 
 	public:
 		bool useAntialiasing;
-		uint32_t numSelected;
+//		uint32_t numSelected;
 		uint32_t numHovered;
 		bool shiftDown;
 		bool ctrlDown;
@@ -65,11 +78,16 @@ class DrawingView: public QWidget
 		bool collided;
 		bool scrollDrag;
 		Vector oldPoint;
+		QString informativeText;
 
 	public:
 		std::vector<void *> select;
 		std::vector<void *> hover;
+		std::vector<void *> toolObjects;
+		std::vector<Object> toolScratch;
 		Point toolPoint[32];
+		Point intersectionPoint;
+		bool hoveringIntersection;
 
 //	public:
 //		static Container document;