# HG changeset patch # User John Tsiombikas # Date 1395431137 -7200 # Node ID e0916bb20b7f3ad4eb3896c0f794c7d1d5acc390 # Parent f1014234dece536c15a614c0f73ca749bda0371d changed the name to goatkit diff -r f1014234dece -r e0916bb20b7f include/button.h --- a/include/button.h Fri Mar 21 03:37:16 2014 +0200 +++ b/include/button.h Fri Mar 21 21:45:37 2014 +0200 @@ -1,9 +1,9 @@ -#ifndef GAMEUI_BUTTON_H_ -#define GAMEUI_BUTTON_H_ +#ifndef GOATKIT_BUTTON_H_ +#define GOATKIT_BUTTON_H_ #include "widget.h" -namespace gameui { +namespace goatkit { struct ButtonImpl; @@ -16,6 +16,6 @@ virtual ~Button(); }; -} +} // namespace goatkit -#endif // GAMEUI_BUTTON_H_ +#endif // GOATKIT_BUTTON_H_ diff -r f1014234dece -r e0916bb20b7f include/gameui.h --- a/include/gameui.h Fri Mar 21 03:37:16 2014 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ -#ifndef GAMEUI_H_ -#define GAMEUI_H_ - -#include "widget.h" -#include "button.h" -#include "label.h" - -#endif // GAMEUI_H_ diff -r f1014234dece -r e0916bb20b7f include/goatkit.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/include/goatkit.h Fri Mar 21 21:45:37 2014 +0200 @@ -0,0 +1,8 @@ +#ifndef GOATKIT_H_ +#define GOATKIT_H_ + +#include "widget.h" +#include "button.h" +#include "label.h" + +#endif // GOATKIT_H_ diff -r f1014234dece -r e0916bb20b7f include/label.h --- a/include/label.h Fri Mar 21 03:37:16 2014 +0200 +++ b/include/label.h Fri Mar 21 21:45:37 2014 +0200 @@ -1,7 +1,7 @@ -#ifndef GAMEUI_LABEL_H_ -#define GAMEUI_LABEL_H_ +#ifndef GOATKIT_LABEL_H_ +#define GOATKIT_LABEL_H_ -namespace gameui { +namespace goatkit { class LabelImpl; @@ -14,6 +14,6 @@ virtual ~Label(); }; -} +} // namespace goatkit -#endif // GAMEUI_LABEL_H_ +#endif // GOATKIT_LABEL_H_ diff -r f1014234dece -r e0916bb20b7f include/widget.h --- a/include/widget.h Fri Mar 21 03:37:16 2014 +0200 +++ b/include/widget.h Fri Mar 21 21:45:37 2014 +0200 @@ -1,10 +1,10 @@ -#ifndef GAMEUI_WIDGET_H_ -#define GAMEUI_WIDGET_H_ +#ifndef GOATKIT_WIDGET_H_ +#define GOATKIT_WIDGET_H_ #include "vec.h" #include "event.h" -namespace gameui { +namespace goatkit { struct BBox { Vec2 bmin, bmax; @@ -75,4 +75,4 @@ } -#endif // GAMEUI_WIDGET_H_ +#endif // GOATKIT_WIDGET_H_ diff -r f1014234dece -r e0916bb20b7f src/button.cc --- a/src/button.cc Fri Mar 21 03:37:16 2014 +0200 +++ b/src/button.cc Fri Mar 21 21:45:37 2014 +0200 @@ -1,6 +1,6 @@ #include "button.h" -namespace gameui { +namespace goatkit { struct ButtonImpl { }; @@ -15,4 +15,4 @@ delete button; } -} // namespace gameui +} // namespace goatkit diff -r f1014234dece -r e0916bb20b7f src/event.h --- a/src/event.h Fri Mar 21 03:37:16 2014 +0200 +++ b/src/event.h Fri Mar 21 21:45:37 2014 +0200 @@ -3,7 +3,7 @@ #include "vec.h" -namespace gameui { +namespace goatkit { enum EventType { EV_MOUSE_BUTTON, @@ -40,6 +40,6 @@ KeyEvent key; }; -} // namespace gameui +} // namespace goatkit #endif // EVENT_H_ diff -r f1014234dece -r e0916bb20b7f src/gameui_impl.h --- a/src/gameui_impl.h Fri Mar 21 03:37:16 2014 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -#ifndef GAMEUI_IMPL_H_ -#define GAMEUI_IMPL_H_ - -#endif // GAMEUI_IMPL_H_ diff -r f1014234dece -r e0916bb20b7f src/theme.cc --- a/src/theme.cc Fri Mar 21 03:37:16 2014 +0200 +++ b/src/theme.cc Fri Mar 21 21:45:37 2014 +0200 @@ -12,7 +12,7 @@ #endif -namespace gameui { +namespace goatkit { Theme *theme; @@ -97,4 +97,4 @@ glPopAttrib(); } -} // namespace gameui +} // namespace goatkit diff -r f1014234dece -r e0916bb20b7f src/theme.h --- a/src/theme.h Fri Mar 21 03:37:16 2014 +0200 +++ b/src/theme.h Fri Mar 21 21:45:37 2014 +0200 @@ -4,7 +4,7 @@ #include #include -namespace gameui { +namespace goatkit { class Widget; @@ -28,6 +28,6 @@ extern Theme *theme; // the current theme -} // namespace gameui +} // namespace goatkit #endif // THEME_H_ diff -r f1014234dece -r e0916bb20b7f src/vec.h --- a/src/vec.h Fri Mar 21 03:37:16 2014 +0200 +++ b/src/vec.h Fri Mar 21 21:45:37 2014 +0200 @@ -1,7 +1,7 @@ #ifndef VEC_H_ #define VEC_H_ -namespace gameui { +namespace goatkit { class Vec2 { public: @@ -11,6 +11,6 @@ Vec2(float xx, float yy) : x(xx), y(yy) {} }; -} // namespace gameui +} // namespace goatkit #endif // VEC_H_ diff -r f1014234dece -r e0916bb20b7f src/widget.cc --- a/src/widget.cc Fri Mar 21 03:37:16 2014 +0200 +++ b/src/widget.cc Fri Mar 21 21:45:37 2014 +0200 @@ -6,7 +6,7 @@ #include "boolanm.h" #include "theme.h" -namespace gameui { +namespace goatkit { struct WidgetImpl { std::string type_str; @@ -263,4 +263,4 @@ } -} // namespace gameui +} // namespace goatkit diff -r f1014234dece -r e0916bb20b7f test.cc --- a/test.cc Fri Mar 21 03:37:16 2014 +0200 +++ b/test.cc Fri Mar 21 21:45:37 2014 +0200 @@ -3,7 +3,7 @@ #include #include #include -#include "gameui.h" +#include "goatkit.h" static bool init(); static void cleanup(); @@ -17,14 +17,14 @@ static void mouse(int bn, int st, int x, int y); static void motion(int x, int y); -static std::vector widgets; +static std::vector widgets; int main(int argc, char **argv) { glutInitWindowSize(800, 600); glutInit(&argc, argv); glutInitDisplayMode(GLUT_RGB | GLUT_DEPTH | GLUT_DOUBLE); - glutCreateWindow("gameui test"); + glutCreateWindow("goatkit test"); glutDisplayFunc(disp); glutIdleFunc(idle); @@ -49,7 +49,7 @@ static bool init() { - gameui::Button *button = new gameui::Button; + goatkit::Button *button = new goatkit::Button; button->set_position(350, 280); button->set_size(100, 40); widgets.push_back(button); @@ -115,14 +115,14 @@ bool down = st == GLUT_DOWN; for(size_t i=0; ihit_test(gameui::Vec2(x, y))) { - gameui::Event ev; - ev.type = gameui::EV_MOUSE_BUTTON; + if(w->hit_test(goatkit::Vec2(x, y))) { + goatkit::Event ev; + ev.type = goatkit::EV_MOUSE_BUTTON; ev.button.button = bidx; ev.button.press = down; - ev.button.pos = gameui::Vec2(x, y); + ev.button.pos = goatkit::Vec2(x, y); w->handle_event(ev); } } @@ -130,23 +130,23 @@ static void motion(int x, int y) { - static gameui::Widget *active; + static goatkit::Widget *active; - if(active && !active->hit_test(gameui::Vec2(x, y))) { - gameui::Event ev; - ev.type = gameui::EV_MOUSE_FOCUS; + if(active && !active->hit_test(goatkit::Vec2(x, y))) { + goatkit::Event ev; + ev.type = goatkit::EV_MOUSE_FOCUS; ev.focus.enter = false; active->handle_event(ev); active = 0; } for(size_t i=0; ihit_test(gameui::Vec2(x, y))) { + if(w->hit_test(goatkit::Vec2(x, y))) { if(active != w) { - gameui::Event ev; - ev.type = gameui::EV_MOUSE_FOCUS; + goatkit::Event ev; + ev.type = goatkit::EV_MOUSE_FOCUS; ev.focus.enter = true; w->handle_event(ev); active = w;