Move gui widgets to controls.cpp

src/controls.cpp

@@ -0,0 +1,321 @@
+#include <stdlib.h>
+#include <iostream>
+#include <irrlicht.h>
+
+#include "controls.h"
+
+VertexCtrl::VertexCtrl(IGUIEnvironment *env, IGUIElement *parent, s32 id,
+	const rect<s32> &rectangle, f32 step, const wchar_t *label) :
+	IGUIElement(EGUIET_ELEMENT, env, parent, id, rectangle),
+	vertex(0)
+{
+	env->addStaticText(label, rect<s32>(0,0,20,20),
+		false, false, this);
+
+	IGUISpinBox *spin = env->addSpinBox(L"", rect<s32>(20,0,120,20),
+		true, this, E_CTRL_ID_VERTEX);
+	spin->setDecimalPlaces(2);
+	spin->setValue(0);
+	spin->setStepSize(step);
+	spin->setRange(-1000, 1000);
+}
+
+void VertexCtrl::setValue(const f32 &value)
+{
+	IGUISpinBox *spin = (IGUISpinBox*)getElementFromId(E_CTRL_ID_VERTEX);
+	if (spin)
+	{
+		spin->setValue(value);
+		vertex = value;
+	}
+}
+
+bool VertexCtrl::OnEvent(const SEvent &event)
+{
+	if (event.EventType == EET_GUI_EVENT)
+	{
+		if (event.GUIEvent.EventType == EGET_SPINBOX_CHANGED)
+		{
+			IGUISpinBox *spin = (IGUISpinBox*)event.GUIEvent.Caller;
+			if (spin)
+				vertex = spin->getValue();
+		}
+	}
+	else if (event.GUIEvent.EventType == EGET_ELEMENT_FOCUS_LOST)
+	{
+		setValue(vertex);
+	}
+	return IGUIElement::OnEvent(event);
+}
+
+VectorCtrl::VectorCtrl(IGUIEnvironment *env, IGUIElement *parent, s32 id,
+	const rect<s32> &rectangle, f32 step, const wchar_t *label) :
+	IGUIElement(EGUIET_ELEMENT, env, parent, id, rectangle),
+	vector(vector3df(0,0,0))
+{
+	env->addStaticText(label, rect<s32>(10,0,150,20),
+		false, false, this);
+
+	VertexCtrl *x = new VertexCtrl(env, this, E_CTRL_ID_VECTOR_X,
+		rect<s32>(10,30,150,50), step, L"X");
+	x->drop();
+	VertexCtrl *y = new VertexCtrl(env, this, E_CTRL_ID_VECTOR_Y,
+		rect<s32>(10,60,150,80), step, L"Y");
+	y->drop();
+	VertexCtrl *z = new VertexCtrl(env, this, E_CTRL_ID_VECTOR_Z,
+		rect<s32>(10,90,150,110), step, L"Z");
+	z->drop();
+}
+
+void VectorCtrl::setVector(const vector3df &vec)
+{
+	vector = vec;
+	VertexCtrl *vertex;
+	vertex = (VertexCtrl*)getElementFromId(E_CTRL_ID_VECTOR_X);
+	if (vertex)
+		vertex->setValue(vector.X);
+	vertex = (VertexCtrl*)getElementFromId(E_CTRL_ID_VECTOR_Y);
+	if (vertex)
+		vertex->setValue(vector.Y);
+	vertex = (VertexCtrl*)getElementFromId(E_CTRL_ID_VECTOR_Z);
+	if (vertex)
+		vertex->setValue(vector.Z);
+}
+
+bool VectorCtrl::OnEvent(const SEvent &event)
+{
+	if (event.EventType == EET_GUI_EVENT &&
+		event.GUIEvent.EventType == EGET_SPINBOX_CHANGED)
+	{
+		VertexCtrl *vertex = (VertexCtrl*)event.GUIEvent.Caller->getParent();
+		if (vertex)
+		{
+			switch (vertex->getID())
+			{
+			case E_CTRL_ID_VECTOR_X:
+				vector.X = vertex->getValue();
+				break;
+			case E_CTRL_ID_VECTOR_Y:
+				vector.Y = vertex->getValue();
+				break;
+			case E_CTRL_ID_VECTOR_Z:
+				vector.Z = vertex->getValue();
+				break;
+			default:
+				break;
+			}
+			SEvent new_event = event;
+			new_event.GUIEvent.Caller = this;
+			return IGUIElement::OnEvent(new_event);
+		}
+	}
+	return IGUIElement::OnEvent(event);
+}
+
+AnimCtrl::AnimCtrl(IGUIEnvironment *env, IGUIElement *parent, s32 id,
+	const rect<s32> &rectangle) :
+	IGUIElement(EGUIET_ELEMENT, env, parent, id, rectangle),
+	button_id(E_CTRL_ID_PAUSE)
+{
+	IVideoDriver *driver = env->getVideoDriver();
+	ITexture *image;
+	IGUIButton *button;
+
+	image = driver->getTexture("skip_rev.png");
+	button = env->addButton(rect<s32>(0,4,23,27), this,
+		E_CTRL_ID_SKIP_REV);
+	button->setImage(image);
+	button->setUseAlphaChannel(true);
+
+	image = driver->getTexture("play_rev.png");
+	button = env->addButton(rect<s32>(24,4,47,27), this,
+		E_CTRL_ID_PLAY_REV);
+	button->setImage(image);
+	button->setUseAlphaChannel(true);
+
+	image = driver->getTexture("pause.png");
+	button = env->addButton(rect<s32>(48,4,71,27), this,
+		E_CTRL_ID_PAUSE);
+	button->setImage(image);
+	button->setUseAlphaChannel(true);
+
+	image = driver->getTexture("play_fwd.png");
+	button = env->addButton(rect<s32>(72,4,95,27), this,
+		E_CTRL_ID_PLAY_FWD);
+	button->setImage(image);
+	button->setUseAlphaChannel(true);
+
+	image = driver->getTexture("skip_fwd.png");
+	button = env->addButton(rect<s32>(96,4,119,27), this,
+		E_CTRL_ID_SKIP_FWD);
+	button->setImage(image);
+	button->setUseAlphaChannel(true);
+}
+
+bool AnimCtrl::OnEvent(const SEvent &event)
+{
+	if (event.EventType == EET_GUI_EVENT)
+	{
+		if (event.GUIEvent.EventType == EGET_BUTTON_CLICKED)
+		{
+			reset(true);
+			IGUIButton *button = (IGUIButton*)event.GUIEvent.Caller;
+			button->setEnabled(false);
+			button->setPressed(true);
+			button_id = button->getID();
+		}
+		else if (event.GUIEvent.EventType == EGET_ELEMENT_FOCUS_LOST)
+		{
+			if (button_id == E_CTRL_ID_SKIP_FWD ||
+				button_id == E_CTRL_ID_SKIP_REV)
+			{
+				reset(true);
+				IGUIButton *button = (IGUIButton*)
+					getElementFromId(E_CTRL_ID_PAUSE);
+				if (button)
+					button->setPressed(true);
+				button_id = E_CTRL_ID_PAUSE;
+			}
+		}
+	}
+	return IGUIElement::OnEvent(event);
+}
+
+void AnimCtrl::reset(bool enabled)
+{
+	const list<IGUIElement*> &children = getChildren();
+	list<IGUIElement*>::ConstIterator iter = children.begin();
+	while (iter != children.end())
+	{
+		if ((*iter)->getType() == EGUIET_BUTTON)
+		{
+			IGUIButton *button = (IGUIButton*)(*iter);
+			button->setEnabled(enabled);
+			button->setPressed(false);
+		}
+		++iter;
+	}
+}
+
+HyperlinkCtrl::HyperlinkCtrl(IGUIEnvironment *env, IGUIElement *parent, s32 id,
+	const rect<s32> &rectangle, std::string title, std::string url) :
+	IGUIElement(EGUIET_ELEMENT, env, parent, id, rectangle),
+	url(url),
+	is_active(false)
+{
+	IGUIStaticText *text = env->addStaticText(stringw(title.c_str()).c_str(),
+		rect<s32>(0,0,rectangle.getWidth(),20), false, false, this);
+	text->setOverrideColor(SColor(255,0,0,255));
+	text->setTextAlignment(EGUIA_CENTER, EGUIA_CENTER);
+}
+
+void HyperlinkCtrl::draw()
+{
+	if (is_active)
+	{
+		IVideoDriver *driver = Environment->getVideoDriver();
+		rect<s32> pos = getAbsolutePosition();
+		vector2di end = pos.LowerRightCorner;
+		vector2di start = end - vector2di(pos.getWidth(), 0);
+		driver->draw2DLine(start, end, SColor(255,0,0,255));
+	}
+	IGUIElement::draw();
+}
+
+
+void HyperlinkCtrl::openBrowser(std::string url)
+{
+	system((std::string("xdg-open \"") + url + std::string("\"")).c_str());
+}
+
+bool HyperlinkCtrl::OnEvent(const SEvent &event)
+{
+	if (event.EventType == EET_GUI_EVENT)
+	{
+		if (event.GUIEvent.EventType == EGET_ELEMENT_HOVERED)
+			is_active = true;
+		else if (event.GUIEvent.EventType == EGET_ELEMENT_LEFT)
+			is_active = false;
+	}
+	else if (is_active && event.EventType == EET_MOUSE_INPUT_EVENT &&
+		event.MouseInput.Event == EMIE_LMOUSE_PRESSED_DOWN)
+	{
+		openBrowser(url);
+	}
+	return IGUIElement::OnEvent(event);
+}
+
+ColorCtrl::ColorCtrl(IGUIEnvironment *env, IGUIElement *parent, s32 id,
+	const rect<s32> &rectangle, const wchar_t *label) :
+	IGUIElement(EGUIET_ELEMENT, env, parent, id, rectangle)
+{
+	IVideoDriver *driver = env->getVideoDriver();
+	env->addStaticText(label, rect<s32>(0,0,160,20), false, false, this);
+
+	IGUIEditBox *edit = env->addEditBox(L"", rect<s32>(180,0,250,20), true,
+		this, E_CTRL_ID_COLOR_EDIT);
+	edit->setMax(6);
+	edit->setToolTipText(L"Hex color RRGGBB");
+
+	ITexture *texture = driver->findTexture("color_preview");
+	if (!texture)
+	{
+		IImage *image = driver->createImage(ECF_A8R8G8B8, dimension2du(30,20));
+		image->fill(SColor(255,255,255,255));
+		texture = driver->addTexture("color_preview", image);
+		image->drop();
+	}
+	IGUIImage *preview = env->addImage(rect<s32>(270,0,300,20), this,
+		E_CTRL_ID_COLOR_PREVIEW);
+	preview->setImage(texture);
+}
+
+void ColorCtrl::setColor(const std::string &hex)
+{
+	if (!isValidHexString(hex))
+		return;
+
+	stringw text = hex.c_str();
+	IGUIEditBox *edit = (IGUIEditBox*)
+		getElementFromId(E_CTRL_ID_COLOR_EDIT);
+	if (edit)
+		edit->setText(text.c_str());
+	IGUIImage *preview = (IGUIImage*)
+		getElementFromId(E_CTRL_ID_COLOR_PREVIEW);
+	if (preview)
+	{
+		SColor color;
+		color.color = std::stoul(hex, nullptr, 16);
+		color.setAlpha(255);
+		preview->setColor(color);
+	}
+}
+
+std::string ColorCtrl::getColor() const
+{
+	std::string hex = "";
+	IGUIEditBox *edit = (IGUIEditBox*)
+		getElementFromId(E_CTRL_ID_COLOR_EDIT);
+	if (edit)
+		hex = stringc(edit->getText()).c_str();
+	return hex;
+}
+
+bool ColorCtrl::isValidHexString(std::string hex)
+{
+	return (hex.length() == 6 &&
+		hex.find_first_not_of("0123456789abcdefABCDEF") == std::string::npos);
+}
+
+bool ColorCtrl::OnEvent(const SEvent &event)
+{
+	if (event.EventType == EET_GUI_EVENT &&
+		event.GUIEvent.EventType == EGET_EDITBOX_CHANGED &&
+		event.GUIEvent.Caller->getID() == E_CTRL_ID_COLOR_EDIT)
+	{
+		IGUIEditBox *edit = (IGUIEditBox*)event.GUIEvent.Caller;
+		std::string hex = stringc(edit->getText()).c_str();
+		setColor(hex);
+	}
+	return IGUIElement::OnEvent(event);
+}

src/controls.h

@@ -0,0 +1,95 @@
+#ifndef D_CONTROLS_H
+#define D_CONTROLS_H
+
+using namespace irr;
+using namespace core;
+using namespace scene;
+using namespace gui;
+using namespace video;
+
+enum
+{
+	E_CTRL_ID_VERTEX,
+	E_CTRL_ID_VECTOR_X,
+	E_CTRL_ID_VECTOR_Y,
+	E_CTRL_ID_VECTOR_Z,
+	E_CTRL_ID_SKIP_REV,
+	E_CTRL_ID_PLAY_REV,
+	E_CTRL_ID_PAUSE,
+	E_CTRL_ID_PLAY_FWD,
+	E_CTRL_ID_SKIP_FWD,
+	E_CTRL_ID_COLOR_EDIT,
+	E_CTRL_ID_COLOR_PREVIEW
+};
+
+
+class VertexCtrl : public IGUIElement
+{
+public:
+	VertexCtrl(IGUIEnvironment *env, IGUIElement *parent, s32 id,
+		const rect<s32> &rectangle, f32 step, const wchar_t *label);
+	virtual ~VertexCtrl() {}
+	virtual bool OnEvent(const SEvent &event);
+	f32 getValue() const { return vertex; }
+	void setValue(const f32 &value);
+
+private:
+	f32 vertex;
+};
+
+class VectorCtrl : public IGUIElement
+{
+public:
+	VectorCtrl(IGUIEnvironment *env, IGUIElement *parent, s32 id,
+		const rect<s32> &rectangle, f32 step, const wchar_t *label);
+	virtual ~VectorCtrl() {}
+	virtual bool OnEvent(const SEvent &event);
+	vector3df getVector() const { return vector; }
+	void setVector(const vector3df &vec);
+
+private:
+	vector3df vector;
+};
+
+class AnimCtrl : public IGUIElement
+{
+public:
+	AnimCtrl(IGUIEnvironment *env, IGUIElement *parent, s32 id,
+		const rect<s32> &rectangle);
+	virtual ~AnimCtrl() {}
+	virtual bool OnEvent(const SEvent &event);
+	void reset(bool enabled);
+
+private:
+	s32 button_id;
+};
+
+class HyperlinkCtrl : public IGUIElement
+{
+public:
+	HyperlinkCtrl(IGUIEnvironment *env, IGUIElement *parent, s32 id,
+		const rect<s32> &rectangle, std::string title, std::string url);
+	virtual ~HyperlinkCtrl() {}
+	virtual void draw();
+	virtual bool OnEvent(const SEvent &event);
+	void openBrowser(std::string url);
+
+private:
+	std::string url;
+	bool is_active;
+};
+
+class ColorCtrl : public IGUIElement
+{
+public:
+	ColorCtrl(IGUIEnvironment *env, IGUIElement *parent, s32 id,
+		const rect<s32> &rectangle, const wchar_t *label);
+	virtual ~ColorCtrl() {}
+	virtual bool OnEvent(const SEvent &event);
+	void setColor(const std::string &hex);
+	std::string getColor() const;
+	bool isValidHexString(std::string hex);
+};
+
+
+#endif // D_CONTROLS_H

src/dialog.cpp

@@ -5,8 +5,10 @@
 
 #include "config.h"
 #include "scene.h"
-#include "dialog.h"
+#include "controls.h"
 #include "tinyfiledialogs.h"
+#include "dialog.h"
+
 
 #ifdef USE_CMAKE_CONFIG_H
 #include "cmake_config.h"
@@ -64,128 +66,6 @@ namespace dialog
 			filter_count);
 		thread.detach();
 	}
-
-	void openBrowser(std::string url)
-	{
-		system((std::string("xdg-open \"") + url + std::string("\"")).c_str());
-	}
-}
-
-HyperlinkCtrl::HyperlinkCtrl(IGUIEnvironment *env, IGUIElement *parent, s32 id,
-	const rect<s32> &rectangle, std::string title, std::string url) :
-	IGUIElement(EGUIET_ELEMENT, env, parent, id, rectangle),
-	url(url),
-	is_active(false)
-{
-	IGUIStaticText *text = env->addStaticText(stringw(title.c_str()).c_str(),
-		rect<s32>(0,0,rectangle.getWidth(),20), false, false, this);
-	text->setOverrideColor(SColor(255,0,0,255));
-	text->setTextAlignment(EGUIA_CENTER, EGUIA_CENTER);
-}
-
-void HyperlinkCtrl::draw()
-{
-	if (is_active)
-	{
-		IVideoDriver *driver = Environment->getVideoDriver();
-		rect<s32> pos = getAbsolutePosition();
-		vector2di end = pos.LowerRightCorner;
-		vector2di start = end - vector2di(pos.getWidth(), 0);
-		driver->draw2DLine(start, end, SColor(255,0,0,255));
-	}
-	IGUIElement::draw();
-}
-
-bool HyperlinkCtrl::OnEvent(const SEvent &event)
-{
-	if (event.EventType == EET_GUI_EVENT)
-	{
-		if (event.GUIEvent.EventType == EGET_ELEMENT_HOVERED)
-			is_active = true;
-		else if (event.GUIEvent.EventType == EGET_ELEMENT_LEFT)
-			is_active = false;
-	}
-	else if (is_active && event.EventType == EET_MOUSE_INPUT_EVENT &&
-		event.MouseInput.Event == EMIE_LMOUSE_PRESSED_DOWN)
-	{
-		dialog::openBrowser(url);
-	}
-	return IGUIElement::OnEvent(event);
-}
-
-static inline bool isValidHexString(std::string hex)
-{
-	return (hex.length() == 6 &&
-		hex.find_first_not_of("0123456789abcdefABCDEF") == std::string::npos);
-}
-
-ColorCtrl::ColorCtrl(IGUIEnvironment *env, IGUIElement *parent, s32 id,
-	const rect<s32> &rectangle, const wchar_t *label) :
-	IGUIElement(EGUIET_ELEMENT, env, parent, id, rectangle)
-{
-	IVideoDriver *driver = env->getVideoDriver();
-	env->addStaticText(label, rect<s32>(0,0,160,20), false, false, this);
-
-	IGUIEditBox *edit = env->addEditBox(L"", rect<s32>(180,0,250,20), true,
-		this, E_DIALOG_ID_COLOR_EDIT);
-	edit->setMax(6);
-	edit->setToolTipText(L"Hex color RRGGBB");
-
-	ITexture *texture = driver->findTexture("color_preview");
-	if (!texture)
-	{
-		IImage *image = driver->createImage(ECF_A8R8G8B8, dimension2du(30,20));
-		image->fill(SColor(255,255,255,255));
-		texture = driver->addTexture("color_preview", image);
-		image->drop();
-	}
-	IGUIImage *preview = env->addImage(rect<s32>(270,0,300,20), this,
-		E_DIALOG_ID_COLOR_PREVIEW);
-	preview->setImage(texture);
-}
-
-void ColorCtrl::setColor(const std::string &hex)
-{
-	if (!isValidHexString(hex))
-		return;
-
-	stringw text = hex.c_str();
-	IGUIEditBox *edit = (IGUIEditBox*)
-		getElementFromId(E_DIALOG_ID_COLOR_EDIT);
-	if (edit)
-		edit->setText(text.c_str());
-	IGUIImage *preview = (IGUIImage*)
-		getElementFromId(E_DIALOG_ID_COLOR_PREVIEW);
-	if (preview)
-	{
-		SColor color;
-		color.color = std::stoul(hex, nullptr, 16);
-		color.setAlpha(255);
-		preview->setColor(color);
-	}
-}
-
-std::string ColorCtrl::getColor() const
-{
-	std::string hex = "";
-	IGUIEditBox *edit = (IGUIEditBox*)
-		getElementFromId(E_DIALOG_ID_COLOR_EDIT);
-	if (edit)
-		hex = stringc(edit->getText()).c_str();
-	return hex;
-}
-
-bool ColorCtrl::OnEvent(const SEvent &event)
-{
-	if (event.EventType == EET_GUI_EVENT &&
-		event.GUIEvent.EventType == EGET_EDITBOX_CHANGED &&
-		event.GUIEvent.Caller->getID() == E_DIALOG_ID_COLOR_EDIT)
-	{
-		IGUIEditBox *edit = (IGUIEditBox*)event.GUIEvent.Caller;
-		std::string hex = stringc(edit->getText()).c_str();
-		setColor(hex);
-	}
-	return IGUIElement::OnEvent(event);
 }
 
 AboutDialog::AboutDialog(IGUIEnvironment *env, IGUIElement *parent,
@@ -315,14 +195,14 @@ bool SettingsDialog::OnEvent(const SEvent &event)
 		if (color)
 		{
 			const std::string hex = color->getColor();
-			if (isValidHexString(hex))
+			if (color->isValidHexString(hex))
 				conf->set("bg_color", hex);
 		}
 		color = (ColorCtrl*)getElementFromId(E_DIALOG_ID_GRID_COLOR, true);
 		if (color)
 		{
 			const std::string hex = color->getColor();
-			if (isValidHexString(hex))
+			if (color->isValidHexString(hex))
 				conf->set("grid_color", hex);
 		}
 		edit = (IGUIEditBox*)

src/dialog.h

@@ -13,8 +13,6 @@ enum
 	E_DIALOG_ID_SETTINGS,
 	E_DIALOG_ID_BG_COLOR,
 	E_DIALOG_ID_GRID_COLOR,
-	E_DIALOG_ID_COLOR_EDIT,
-	E_DIALOG_ID_COLOR_PREVIEW,
 	E_DIALOG_ID_WIELD_BONE,
 	E_DIALOG_ID_SCREEN_WIDTH,
 	E_DIALOG_ID_SCREEN_HEIGHT,
@@ -68,31 +66,6 @@ namespace dialog
 
 class Config;
 
-class HyperlinkCtrl : public IGUIElement
-{
-public:
-	HyperlinkCtrl(IGUIEnvironment *env, IGUIElement *parent, s32 id,
-		const rect<s32> &rectangle, std::string title, std::string url);
-	virtual ~HyperlinkCtrl() {}
-	virtual void draw();
-	virtual bool OnEvent(const SEvent &event);
-
-private:
-	std::string url;
-	bool is_active;
-};
-
-class ColorCtrl : public IGUIElement
-{
-public:
-	ColorCtrl(IGUIEnvironment *env, IGUIElement *parent, s32 id,
-		const rect<s32> &rectangle, const wchar_t *label);
-	virtual ~ColorCtrl() {}
-	virtual bool OnEvent(const SEvent &event);
-	void setColor(const std::string &hex);
-	std::string getColor() const;
-};
-
 class AboutDialog : public IGUIElement
 {
 public:

src/gui.cpp

@@ -5,201 +5,9 @@
 #include "config.h"
 #include "scene.h"
 #include "dialog.h"
+#include "controls.h"
 #include "gui.h"
 
-VertexCtrl::VertexCtrl(IGUIEnvironment *env, IGUIElement *parent, s32 id,
-	const rect<s32> &rectangle, f32 step, const wchar_t *label) :
-	IGUIElement(EGUIET_ELEMENT, env, parent, id, rectangle),
-	vertex(0)
-{
-	env->addStaticText(label, rect<s32>(0,0,20,20),
-		false, false, this);
-
-	IGUISpinBox *spin = env->addSpinBox(L"", rect<s32>(20,0,120,20),
-		true, this, E_GUI_ID_VERTEX);
-	spin->setDecimalPlaces(2);
-	spin->setValue(0);
-	spin->setStepSize(step);
-	spin->setRange(-1000, 1000);
-}
-
-void VertexCtrl::setValue(const f32 &value)
-{
-	IGUISpinBox *spin = (IGUISpinBox*)getElementFromId(E_GUI_ID_VERTEX);
-	if (spin)
-	{
-		spin->setValue(value);
-		vertex = value;
-	}
-}
-
-bool VertexCtrl::OnEvent(const SEvent &event)
-{
-	if (event.EventType == EET_GUI_EVENT)
-	{
-		if (event.GUIEvent.EventType == EGET_SPINBOX_CHANGED)
-		{
-			IGUISpinBox *spin = (IGUISpinBox*)event.GUIEvent.Caller;
-			if (spin)
-				vertex = spin->getValue();
-		}
-	}
-	else if (event.GUIEvent.EventType == EGET_ELEMENT_FOCUS_LOST)
-	{
-		setValue(vertex);
-	}
-	return IGUIElement::OnEvent(event);
-}
-
-VectorCtrl::VectorCtrl(IGUIEnvironment *env, IGUIElement *parent, s32 id,
-	const rect<s32> &rectangle, f32 step, const wchar_t *label) :
-	IGUIElement(EGUIET_ELEMENT, env, parent, id, rectangle),
-	vector(vector3df(0,0,0))
-{
-	env->addStaticText(label, rect<s32>(10,0,150,20),
-		false, false, this);
-
-	VertexCtrl *x = new VertexCtrl(env, this, E_GUI_ID_VECTOR_X,
-		rect<s32>(10,30,150,50), step, L"X");
-	x->drop();
-	VertexCtrl *y = new VertexCtrl(env, this, E_GUI_ID_VECTOR_Y,
-		rect<s32>(10,60,150,80), step, L"Y");
-	y->drop();
-	VertexCtrl *z = new VertexCtrl(env, this, E_GUI_ID_VECTOR_Z,
-		rect<s32>(10,90,150,110), step, L"Z");
-	z->drop();
-}
-
-void VectorCtrl::setVector(const vector3df &vec)
-{
-	vector = vec;
-	VertexCtrl *vertex;
-	vertex = (VertexCtrl*)getElementFromId(E_GUI_ID_VECTOR_X);
-	if (vertex)
-		vertex->setValue(vector.X);
-	vertex = (VertexCtrl*)getElementFromId(E_GUI_ID_VECTOR_Y);
-	if (vertex)
-		vertex->setValue(vector.Y);
-	vertex = (VertexCtrl*)getElementFromId(E_GUI_ID_VECTOR_Z);
-	if (vertex)
-		vertex->setValue(vector.Z);
-}
-
-bool VectorCtrl::OnEvent(const SEvent &event)
-{
-	if (event.EventType == EET_GUI_EVENT &&
-		event.GUIEvent.EventType == EGET_SPINBOX_CHANGED)
-	{
-		VertexCtrl *vertex = (VertexCtrl*)event.GUIEvent.Caller->getParent();
-		if (vertex)
-		{
-			switch (vertex->getID())
-			{
-			case E_GUI_ID_VECTOR_X:
-				vector.X = vertex->getValue();
-				break;
-			case E_GUI_ID_VECTOR_Y:
-				vector.Y = vertex->getValue();
-				break;
-			case E_GUI_ID_VECTOR_Z:
-				vector.Z = vertex->getValue();
-				break;
-			default:
-				break;
-			}
-			SEvent new_event = event;
-			new_event.GUIEvent.Caller = this;
-			return IGUIElement::OnEvent(new_event);
-		}
-	}
-	return IGUIElement::OnEvent(event);
-}
-
-AnimCtrl::AnimCtrl(IGUIEnvironment *env, IGUIElement *parent, s32 id,
-	const rect<s32> &rectangle) :
-	IGUIElement(EGUIET_ELEMENT, env, parent, id, rectangle),
-	button_id(E_GUI_ID_PAUSE)
-{
-	IVideoDriver *driver = env->getVideoDriver();
-	ITexture *image;
-	IGUIButton *button;
-
-	image = driver->getTexture("skip_rev.png");
-	button = env->addButton(rect<s32>(0,4,23,27), this,
-		E_GUI_ID_SKIP_REV);
-	button->setImage(image);
-	button->setUseAlphaChannel(true);
-
-	image = driver->getTexture("play_rev.png");
-	button = env->addButton(rect<s32>(24,4,47,27), this,
-		E_GUI_ID_PLAY_REV);
-	button->setImage(image);
-	button->setUseAlphaChannel(true);
-
-	image = driver->getTexture("pause.png");
-	button = env->addButton(rect<s32>(48,4,71,27), this,
-		E_GUI_ID_PAUSE);
-	button->setImage(image);
-	button->setUseAlphaChannel(true);
-
-	image = driver->getTexture("play_fwd.png");
-	button = env->addButton(rect<s32>(72,4,95,27), this,
-		E_GUI_ID_PLAY_FWD);
-	button->setImage(image);
-	button->setUseAlphaChannel(true);
-
-	image = driver->getTexture("skip_fwd.png");
-	button = env->addButton(rect<s32>(96,4,119,27), this,
-		E_GUI_ID_SKIP_FWD);
-	button->setImage(image);
-	button->setUseAlphaChannel(true);
-}
-
-bool AnimCtrl::OnEvent(const SEvent &event)
-{
-	if (event.EventType == EET_GUI_EVENT)
-	{
-		if (event.GUIEvent.EventType == EGET_BUTTON_CLICKED)
-		{
-			reset(true);
-			IGUIButton *button = (IGUIButton*)event.GUIEvent.Caller;
-			button->setEnabled(false);
-			button->setPressed(true);
-			button_id = button->getID();
-		}
-		else if (event.GUIEvent.EventType == EGET_ELEMENT_FOCUS_LOST)
-		{
-			if (button_id == E_GUI_ID_SKIP_FWD ||
-				button_id == E_GUI_ID_SKIP_REV)
-			{
-				reset(true);
-				IGUIButton *button = (IGUIButton*)
-					getElementFromId(E_GUI_ID_PAUSE);
-				if (button)
-					button->setPressed(true);
-				button_id = E_GUI_ID_PAUSE;
-			}
-		}
-	}
-	return IGUIElement::OnEvent(event);
-}
-
-void AnimCtrl::reset(bool enabled)
-{
-	const list<IGUIElement*> &children = getChildren();
-	list<IGUIElement*>::ConstIterator iter = children.begin();
-	while (iter != children.end())
-	{
-		if ((*iter)->getType() == EGUIET_BUTTON)
-		{
-			IGUIButton *button = (IGUIButton*)(*iter);
-			button->setEnabled(enabled);
-			button->setPressed(false);
-		}
-		++iter;
-	}
-}
-
 ToolBox::ToolBox(IGUIEnvironment *env, IGUIElement *parent, s32 id,
 		const rect<s32> &rectangle, ISceneNode *node) :
 	IGUIElement(EGUIET_ELEMENT, env, parent, id, rectangle)

src/gui.h

@@ -29,10 +29,6 @@ enum
 	E_GUI_ID_TRILINEAR,
 	E_GUI_ID_ANISOTROPIC,
 	E_GUI_ID_DEBUG_INFO,
-	E_GUI_ID_VERTEX,
-	E_GUI_ID_VECTOR_X,
-	E_GUI_ID_VECTOR_Y,
-	E_GUI_ID_VECTOR_Z,
 	E_GUI_ID_POSITION,
 	E_GUI_ID_ROTATION,
 	E_GUI_ID_SCALE,
@@ -42,56 +38,10 @@ enum
 	E_GUI_ID_ANIM_END,
 	E_GUI_ID_ANIM_FRAME,
 	E_GUI_ID_ANIM_SPEED,
-	E_GUI_ID_SKIP_REV,
-	E_GUI_ID_PLAY_REV,
-	E_GUI_ID_PAUSE,
-	E_GUI_ID_PLAY_FWD,
-	E_GUI_ID_SKIP_FWD
 };
 
 class Config;
 
-class VertexCtrl : public IGUIElement
-{
-public:
-	VertexCtrl(IGUIEnvironment *env, IGUIElement *parent, s32 id,
-		const rect<s32> &rectangle, f32 step, const wchar_t *label);
-	virtual ~VertexCtrl() {}
-	virtual bool OnEvent(const SEvent &event);
-	f32 getValue() const { return vertex; }
-	void setValue(const f32 &value);
-
-private:
-	f32 vertex;
-};
-
-class VectorCtrl : public IGUIElement
-{
-public:
-	VectorCtrl(IGUIEnvironment *env, IGUIElement *parent, s32 id,
-		const rect<s32> &rectangle, f32 step, const wchar_t *label);
-	virtual ~VectorCtrl() {}
-	virtual bool OnEvent(const SEvent &event);
-	vector3df getVector() const { return vector; }
-	void setVector(const vector3df &vec);
-
-private:
-	vector3df vector;
-};
-
-class AnimCtrl : public IGUIElement
-{
-public:
-	AnimCtrl(IGUIEnvironment *env, IGUIElement *parent, s32 id,
-		const rect<s32> &rectangle);
-	virtual ~AnimCtrl() {}
-	virtual bool OnEvent(const SEvent &event);
-	void reset(bool enabled);
-
-private:
-	s32 button_id;
-};
-
 class ToolBox : public IGUIElement
 {
 public:

src/viewer.cpp

@@ -8,6 +8,7 @@
 #include "trackball.h"
 #include "gui.h"
 #include "dialog.h"
+#include "controls.h"
 #include "viewer.h"
 
 #define M_ZOOM_IN(fov) std::max(fov - DEGTORAD * 2, PI * 0.0125f)
@@ -350,7 +351,7 @@ bool Viewer::OnEvent(const SEvent &event)
 			s32 id = event.GUIEvent.Caller->getID();
 			switch (id)
 			{
-			case E_GUI_ID_SKIP_REV:
+			case E_CTRL_ID_SKIP_REV:
 				scene->setAnimation(
 					animation->getField(E_GUI_ID_ANIM_START),
 					animation->getField(E_GUI_ID_ANIM_START),
@@ -358,7 +359,7 @@ bool Viewer::OnEvent(const SEvent &event)
 				animation->setState(E_ANIM_STATE_PAUSED);
 				gui->setFocused(false);
 				break;
-			case E_GUI_ID_PLAY_REV:
+			case E_CTRL_ID_PLAY_REV:
 				scene->setAnimation(
 					animation->getField(E_GUI_ID_ANIM_START),
 					animation->getField(E_GUI_ID_ANIM_END),
@@ -366,7 +367,7 @@ bool Viewer::OnEvent(const SEvent &event)
 				animation->setState(E_ANIM_STATE_PLAY_REV);
 				gui->setFocused(false);
 				break;
-			case E_GUI_ID_PAUSE:
+			case E_CTRL_ID_PAUSE:
 				scene->setAnimation(
 					animation->getFrame(),
 					animation->getFrame(),
@@ -374,7 +375,7 @@ bool Viewer::OnEvent(const SEvent &event)
 				animation->setState(E_ANIM_STATE_PAUSED);
 				gui->setFocused(false);
 				break;
-			case E_GUI_ID_PLAY_FWD:
+			case E_CTRL_ID_PLAY_FWD:
 				scene->setAnimation(
 					animation->getField(E_GUI_ID_ANIM_START),
 					animation->getField(E_GUI_ID_ANIM_END),
@@ -382,7 +383,7 @@ bool Viewer::OnEvent(const SEvent &event)
 				animation->setState(E_ANIM_STATE_PLAY_FWD);
 				gui->setFocused(false);
 				break;
-			case E_GUI_ID_SKIP_FWD:
+			case E_CTRL_ID_SKIP_FWD:
 				scene->setAnimation(
 					animation->getField(E_GUI_ID_ANIM_END),
 					animation->getField(E_GUI_ID_ANIM_END),
@@ -587,7 +588,7 @@ void AnimState::load(ISceneNode *node)
 	if (enabled)
 	{
 		IGUIButton *button =
-			(IGUIButton*)anim->getElementFromId(E_GUI_ID_PAUSE, true);
+			(IGUIButton*)anim->getElementFromId(E_CTRL_ID_PAUSE, true);
 		button->setPressed(true);
 	}
 }