Added surface tool

src/include/Enum.h

@@ -5,7 +5,7 @@ namespace Enum
 	namespace SurfaceType
 	{
 		enum Value {
-			Smooth, Snaps, Inlets, Glue, Weld, Spawn, Hinge, Motor, Bumps
+			Smooth = 0, Bumps = 1, Hinge = 2, Motor = 3, StepperMotor = 4, Spawn = 5
 		};
 	}
 	namespace Shape

src/include/Enums.h

@@ -1,16 +0,0 @@
-#ifdef UENUMS
-#ifndef ENUM_H
-#define ENUM_H
-static enum BinType {GameTool, Grab, Clone, Hammer};
-static enum ControllerType {None, KeyboardRight, KeyboardLeft, Joypad1, Joypad2, Chase, Flee};
-//static enum JointType {UNK0, WeldJoint, SnapJoint, UNK3, Rotate, RotateP, RotateV, GlueJoint, UNK8, UNK9, None};
-static enum ActionType {Nothing, Pause, Lose, Draw, Win};
-static enum AffectType {NoChange, Increase, Decrease};
-static enum InputType {NoInput, LeftTread, RightTread, Steer, Throtle, UpDown, Action1, Action2, Action3, Action4, Action5, Constant, Sin};
-//static enum SurfaceConstraint {None, Hinge, SteppingMotor, Motor};
-static enum SurfaceType{Smooth, Snaps, Inlets, Glue, Weld, Spawn, Hinge, Motor, Bumps};
-static enum SoundType {NoSound, Boing, Bomb, Break, Click, Clock, Slingshot, Page, Ping, Snap, Splat, Step, StepOn, Swoosh, Victory};
-static enum PartType {Ball, Block, Cylinder};
-static enum KeywordFilterType {Include, Exclude};
-#endif
-#endif

src/include/Tool/ArrowTool.h

@@ -7,12 +7,12 @@ class ArrowTool :
 public:
 	ArrowTool(void); //OnSelect?
 	~ArrowTool(void); //OnDeselect?
-	virtual void onButton1MouseDown(Mouse);
-	virtual void onButton1MouseUp(Mouse);
-	virtual void onMouseMoved(Mouse mouse);
-	virtual void onSelect(Mouse mouse); 
-	virtual void onKeyDown(int key);
-	virtual void onKeyUp(int key);
+	void onButton1MouseDown(Mouse);
+	void onButton1MouseUp(Mouse);
+	void onMouseMoved(Mouse mouse);
+	void onSelect(Mouse mouse); 
+	void onKeyDown(int key);
+	void onKeyUp(int key);
 private:
 	bool lctrlDown;
 	bool rctrlDown;

src/include/Tool/SurfaceTool.h

@@ -0,0 +1,20 @@
+#pragma once
+#include "tool.h"
+#include "Enum.h"
+
+class SurfaceTool :
+	public Tool
+{
+public:
+	SurfaceTool(Enum::SurfaceType::Value surface, int extraParam); //OnSelect?
+	~SurfaceTool(void); //OnDeselect?
+	void onButton1MouseDown(Mouse);
+	void onButton1MouseUp(Mouse);
+	void onMouseMoved(Mouse mouse);
+	void onSelect(Mouse mouse); 
+	void onKeyDown(int key);
+	void onKeyUp(int key);
+private:
+	Enum::SurfaceType::Value surface;
+	int param;
+};