Some minor changes

7 files changed, 0 insertions, 251 deletions

diff --git a/includes/interface.old/Button.h b/includes/interface.old/Button.h
deleted file mode 100644
index 1b2900e..0000000
--- a/includes/interface.old/Button.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Button.h
- *
- *  Created on: Jan 8, 2012
- *      Author: Simon
- */
-
-#ifndef BUTTON_H_
-#define BUTTON_H_
-
-#include <string>
-
-#include "Component.h"
-
-namespace ui
-{
-    class Button : public Component
-    {
-    public:
-        Button(int x, int y, int width, int height, const std::string& buttonText);
-
-        bool Toggleable;
-
-        std::string ButtonText;
-
-        virtual void OnMouseClick(int x, int y, unsigned int button);
-        virtual void OnMouseUnclick(int x, int y, unsigned int button);
-        virtual void OnMouseUp(int x, int y, unsigned int button);
-
-        virtual void OnMouseEnter(int x, int y, int dx, int dy);
-        virtual void OnMouseLeave(int x, int y, int dx, int dy);
-
-        virtual void Draw(void* userdata);
-
-        inline bool GetState() { return state; }
-        virtual void DoAction(); //action of button what ever it may be
-
-    protected:
-        bool isButtonDown, state, isMouseInside;
-    };
-}
-#endif /* BUTTON_H_ */
diff --git a/includes/interface.old/Component.h b/includes/interface.old/Component.h
deleted file mode 100644
index a4d02db..0000000
--- a/includes/interface.old/Component.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Component.h
- *
- *  Created on: Jan 8, 2012
- *      Author: Simon
- */
-
-#ifndef COMPONENT_H_
-#define COMPONENT_H_
-
-namespace ui
-{
-    class State;
-
-	class Component
-	{
-	public:
-		Component(int x, int y, int width, int height);
-		virtual ~Component();
-
-		inline void LocalizePoint(int& x, int& y) { x -= X; y -= Y; } //convert a global point (point on the state) to a point based on component's position
-		inline void GlobalizePoint(int& x, int& y) { x += X; y += Y; } //convert a local point based on component's position to a global point on the state
-
-		bool Focused;
-		bool Visible;
-		bool Enabled;
-		int Width;
-		int Height;
-		int X;
-		int Y;
-
-		virtual void Tick(float dt);
-		virtual void Draw(void* userdata);
-
-		virtual void OnMouseEnter(int localx, int localy, int dx, int dy);
-		virtual void OnMouseLeave(int localx, int localy, int dx, int dy);
-		virtual void OnMouseMoved(int localx, int localy, int dx, int dy);
-		virtual void OnMouseMovedInside(int localx, int localy, int dx, int dy);
-		virtual void OnMouseHover(int localx, int localy);
-		virtual void OnMouseDown(int localx, int localy, unsigned int button);
-		virtual void OnMouseUp(int localx, int localy, unsigned int button);
-		virtual void OnMouseClick(int localx, int localy, unsigned int button);
-		virtual void OnMouseUnclick(int localx, int localy, unsigned int button);
-		virtual void OnMouseWheel(int localx, int localy, int d);
-		virtual void OnMouseWheelInside(int localx, int localy, int d);
-		virtual void OnMouseWheelFocused(int localx, int localy, int d);
-		virtual void OnKeyPress(int key, bool shift, bool ctrl, bool alt);
-		virtual void OnKeyRelease(int key, bool shift, bool ctrl, bool alt);
-
-		State* Parent;
-	};
-}
-#endif /* COMPONENT_H_ */
diff --git a/includes/interface.old/ControlFactory.h b/includes/interface.old/ControlFactory.h
deleted file mode 100644
index 8bfd780..0000000
--- a/includes/interface.old/ControlFactory.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef CONTROLFACTORY_H
-#define CONTROLFACTORY_H
-
-#include "Panel.h"
-#include "Window.h"
-#include "GameSession.h"
-
-class ControlFactory
-{
-public:
-	static ui::Panel * MainMenu(GameSession * session, int x, int y, int width, int height);
-
-};
-
-#endif // CONTROLFACTORY_H
diff --git a/includes/interface.old/Panel.h b/includes/interface.old/Panel.h
deleted file mode 100644
index 9549ff4..0000000
--- a/includes/interface.old/Panel.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Panel.h
- *
- *  Created on: Jan 8, 2012
- *      Author: Simon
- */
-
-#ifndef PANEL_H_
-#define PANEL_H_
-
-#include "interface/Component.h"
-
-namespace ui {
-
-class Panel: public ui::Component {
-public:
-	Panel(int x, int y, int width, int height);
-	virtual ~Panel();
-};
-
-} /* namespace ui */
-#endif /* PANEL_H_ */
diff --git a/includes/interface.old/Sandbox.h b/includes/interface.old/Sandbox.h
deleted file mode 100644
index 32a0471..0000000
--- a/includes/interface.old/Sandbox.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Sandbox.h
- *
- *  Created on: Jan 8, 2012
- *      Author: Simon
- */
-
-#ifndef SANDBOX_H_
-#define SANDBOX_H_
-
-#include "Component.h"
-#include "Simulation.h"
-#include "Renderer.h"
-
-namespace ui {
-
-class Sandbox: public ui::Component {
-private:
-	int lastCoordX, lastCoordY;
-	int activeElement;
-	bool isMouseDown;
-	Renderer * ren;
-	Simulation * sim;
-public:
-	Sandbox();
-	virtual Simulation * GetSimulation();
-	virtual void OnMouseMovedInside(int localx, int localy, int dx, int dy);
-	virtual void OnMouseDown(int localx, int localy, unsigned int button);
-	virtual void OnMouseUp(int localx, int localy, unsigned int button);
-	virtual void Draw(void* userdata);
-	virtual void Tick(float delta);
-	virtual ~Sandbox();
-};
-
-} /* namespace ui */
-#endif /* SANDBOX_H_ */
diff --git a/includes/interface.old/State.h b/includes/interface.old/State.h
deleted file mode 100644
index 00df199..0000000
--- a/includes/interface.old/State.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * State.h
- *
- *  Created on: Jan 8, 2012
- *      Author: Simon
- */
-
-#ifndef STATE_H_
-#define STATE_H_
-
-#include <vector>
-
-#include "interface/Component.h"
-
-namespace ui {
-
-class State
-{
-public:
-	State(int w, int h);
-	virtual ~State();
-
-	bool AllowExclusiveDrawing; //false will not call draw on objects outside of bounds
-
-	virtual void Tick(float dt);
-	virtual void Draw(void* userdata);
-
-	virtual void OnMouseMove(int x, int y);
-	virtual void OnMouseDown(int x, int y, unsigned int button);
-	virtual void OnMouseUp(int x, int y, unsigned int button);
-	virtual void OnMouseWheel(int x, int y, int d);
-	virtual void OnKeyPress(int key, bool shift, bool ctrl, bool alt);
-	virtual void OnKeyRelease(int key, bool shift, bool ctrl, bool alt);
-
-	virtual void Add(Component *child);
-	virtual void Remove(Component *child);
-
-	inline bool IsFocused(Component* c) { return (c == focusedComponent_); }
-	inline int GetMouseX() { return mouseX; }
-	inline int GetMouseY() { return mouseY; }
-	inline int GetWidth() { return width; }
-	inline int GetHeight() { return height; }
-
-protected:
-	std::vector<Component*> Components;
-
-	int width;
-	int height;
-
-	int mouseX;
-	int mouseY;
-	int mouseXP;
-	int mouseYP;
-
-private:
-	Component* focusedComponent_;
-
-};
-
-} /* namespace ui */
-#endif /* STATE_H_ */
diff --git a/includes/interface.old/Window.h b/includes/interface.old/Window.h
deleted file mode 100644
index 86a4bcd..0000000
--- a/includes/interface.old/Window.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Window.h
- *
- *  Created on: Jan 8, 2012
- *      Author: Simon
- */
-
-#ifndef WINDOW_H_
-#define WINDOW_H_
-
-#include "interface/State.h"
-
-namespace ui {
-
-class Window: public ui::State {
-public:
-	Window();
-	virtual ~Window();
-};
-
-} /* namespace ui */
-#endif /* WINDOW_H_ */