Menu
▾
▴
[cadcdev-svn-commits] SF.net SVN: cadcdev: [547] tiki
|
From: <at...@us...> - 2007-11-22 08:18:07
|
Revision: 547
http://cadcdev.svn.sourceforge.net/cadcdev/?rev=547&view=rev
Author: atani
Date: 2007-11-22 00:18:01 -0800 (Thu, 22 Nov 2007)
Log Message:
-----------
initial draft of Tiki::GUI system, not functional (yet)
Modified Paths:
--------------
tiki/osx/Tiki.xcodeproj/project.pbxproj
Added Paths:
-----------
tiki/include/Tiki/gui/
tiki/include/Tiki/gui/button.h
tiki/include/Tiki/gui/graphic.h
tiki/include/Tiki/gui/radiobutton.h
tiki/include/Tiki/gui/spinner.h
tiki/include/Tiki/gui/text.h
tiki/include/Tiki/gui/widget.h
tiki/include/Tiki/gui/window.h
tiki/src/gui/
tiki/src/gui/button.cpp
tiki/src/gui/graphic.cpp
tiki/src/gui/radiobutton.cpp
tiki/src/gui/spinner.cpp
tiki/src/gui/text.cpp
tiki/src/gui/widget.cpp
tiki/src/gui/widget.h
tiki/src/gui/window.cpp
Added: tiki/include/Tiki/gui/button.h
===================================================================
--- tiki/include/Tiki/gui/button.h (rev 0)
+++ tiki/include/Tiki/gui/button.h 2007-11-22 08:18:01 UTC (rev 547)
@@ -0,0 +1,73 @@
+/*
+ Tiki
+
+ button.h
+
+ Copyright (C)2007 Atani Software
+*/
+
+#ifndef __TIKI_GUI_BUTTON_H
+#define __TIKI_GUI_BUTTON_H
+
+#include "Tiki/gui/widget.h"
+#include "Tiki/font.h"
+#include "Tiki/texture.h"
+
+namespace Tiki {
+
+namespace GUI {
+
+/**
+ *
+ *
+ */
+class Button : public Widget {
+ public:
+ Button(const std::string text, GL::Font *font, float size = 24.0f, const std::string name = "") :
+ Widget(name.size() < 1 ? std::string("btn_") + text : name) {
+ m_text = text;
+ m_font = font;
+ m_image = NULL;
+ }
+
+ const std::string & getText() const {
+ return m_text;
+ }
+
+ void setText(const std::string text) {
+ m_text = text;
+ }
+
+ const GL::Texture * getImage() const {
+ return m_image;
+ }
+
+ void setImage(GL::Texture * image) {
+ m_image = image;
+ }
+
+ const GL::Font * getFont() const {
+ return m_font;
+ }
+
+ void setFont(GL::Font * font) {
+ m_font = font;
+ }
+
+ virtual void render(GL::Drawable::ObjType mode);
+
+ protected:
+ TIKI_OBJECT_DECLS( Button )
+
+ private:
+ std::string m_text;
+ GL::Font *m_font;
+ GL::Texture *m_image;
+ mutable Vector m_cachedBoundingBox[2];
+};
+
+}; // namespace GUI
+
+}; // namespace Tiki
+
+#endif // __TIKI_GUI_BUTTON_H
\ No newline at end of file
Added: tiki/include/Tiki/gui/graphic.h
===================================================================
--- tiki/include/Tiki/gui/graphic.h (rev 0)
+++ tiki/include/Tiki/gui/graphic.h 2007-11-22 08:18:01 UTC (rev 547)
@@ -0,0 +1,52 @@
+/*
+ Tiki
+
+ graphic.h
+
+ Copyright (C)2007 Atani Software
+*/
+
+
+#ifndef __TIKI_GUI_GRAPHIC_H
+#define __TIKI_GUI_GRAPHIC_H
+
+#include "Tiki/drawable.h"
+#include "Tiki/texture.h"
+#include "Tiki/drawables/banner.h"
+#include "Tiki/gui/widget.h"
+
+namespace Tiki {
+
+namespace GUI {
+
+class Graphic : public Widget {
+ public:
+ Graphic(GL::Texture *texture, const std::string name = "") :
+ Widget(name.size() < 1 ? std::string("image_")/* + texture->getFileName()*/ : name) {
+ switch(texture->getPxlfmt()) {
+ case GL::Texture::ARGB8888:
+ case GL::Texture::ARGB4444:
+ case GL::Texture::ARGB1555:
+ case GL::Texture::RGBA8888:
+ m_image = new GL::Banner(GL::Drawable::Trans, texture);
+ break;
+ default:
+ m_image = new GL::Banner(GL::Drawable::Opaque, texture);
+ }
+ }
+
+ virtual void render(GL::Drawable::ObjType mode);
+
+ protected:
+ TIKI_OBJECT_DECLS( Graphic )
+
+ private:
+ RefPtr<GL::Banner> m_image;
+
+}; // class Graphic
+
+}; // namespace GUI
+
+}; // namespace Tiki
+
+#endif // __TIKI_GUI_GRAPHIC_H
Added: tiki/include/Tiki/gui/radiobutton.h
===================================================================
--- tiki/include/Tiki/gui/radiobutton.h (rev 0)
+++ tiki/include/Tiki/gui/radiobutton.h 2007-11-22 08:18:01 UTC (rev 547)
@@ -0,0 +1,55 @@
+/*
+ Tiki
+
+ radiobutton.h
+
+ Copyright (C)2007 Atani Software
+*/
+
+
+#ifndef __TIKI_GUI_RADIOBUTTON_H
+#define __TIKI_GUI_RADIOBUTTON_H
+
+#include "Tiki/font.h"
+#include "Tiki/drawables/label.h"
+#include "Tiki/gui/widget.h"
+
+namespace Tiki {
+
+namespace GUI {
+
+class RadioButton : public Widget {
+ public:
+ RadioButton(const std::string & text, GL::Font * font, float size = 24.0f, const std::string & name = "") :
+ Widget(name.size() < 1 ? std::string("radio_") + text : name) {
+ m_text = new GL::Label(font, text, size, false, false);
+ }
+
+ virtual void render(GL::Drawable::ObjType mode);
+
+ protected:
+ TIKI_OBJECT_DECLS( RadioButton )
+
+ private:
+ RefPtr<GL::Label> m_text;
+};
+
+class RadioButtonGroup : public Widget {
+
+ public:
+ RadioButtonGroup(const std::string name = "");
+ virtual void render(GL::Drawable::ObjType mode);
+
+ protected:
+ TIKI_OBJECT_DECLS( RadioButtonGroup )
+
+ private:
+ List<RadioButton> m_options;
+
+}; // class RadioButtonGroup
+
+}; // namespace GUI
+
+}; // namespace Tiki
+
+#endif // __TIKI_GUI_TEXT_H
\ No newline at end of file
Added: tiki/include/Tiki/gui/spinner.h
===================================================================
--- tiki/include/Tiki/gui/spinner.h (rev 0)
+++ tiki/include/Tiki/gui/spinner.h 2007-11-22 08:18:01 UTC (rev 547)
@@ -0,0 +1,42 @@
+/*
+ Tiki
+
+ spinner.h
+
+ Copyright (C)2007 Atani Software
+*/
+
+
+#ifndef __TIKI_GUI_SPINNER_H
+#define __TIKI_GUI_SPINNER_H
+
+#include "Tiki/font.h"
+#include "Tiki/drawables/label.h"
+#include "Tiki/gui/widget.h"
+#include "Tiki/gui/button.h"
+
+namespace Tiki {
+
+namespace GUI {
+
+class Spinner : public Widget {
+ public:
+ Spinner(int minValue, int maxValue, GL::Font * font, float size = 24.0f, const std::string name = "") :
+ Widget(name.size() < 1 ? std::string("spinner_")/* + text */ : name) {
+ //m_label = new GL::Label(font, text, size, false, false);
+ }
+
+ virtual void render(GL::Drawable::ObjType mode);
+
+ protected:
+ TIKI_OBJECT_DECLS( Spinner )
+
+ private:
+
+}; // class Spinner
+
+}; // namespace GUI
+
+}; // namespace Tiki
+
+#endif // __TIKI_GUI_SPINNER_H
\ No newline at end of file
Added: tiki/include/Tiki/gui/text.h
===================================================================
--- tiki/include/Tiki/gui/text.h (rev 0)
+++ tiki/include/Tiki/gui/text.h 2007-11-22 08:18:01 UTC (rev 547)
@@ -0,0 +1,42 @@
+/*
+ Tiki
+
+ text.h
+
+ Copyright (C)2007 Atani Software
+*/
+
+
+#ifndef __TIKI_GUI_TEXT_H
+#define __TIKI_GUI_TEXT_H
+
+#include "Tiki/font.h"
+#include "Tiki/drawables/label.h"
+#include "Tiki/gui/widget.h"
+
+namespace Tiki {
+
+namespace GUI {
+
+class Text : public Widget {
+ public:
+ Text(const std::string & text, GL::Font * font, float size = 24.0f, const std::string name = "") :
+ Widget(name.size() < 1 ? std::string("text_") + text : name) {
+ m_label = new GL::Label(font, text, size, false, false);
+ }
+
+ virtual void render(GL::Drawable::ObjType mode);
+
+ protected:
+ TIKI_OBJECT_DECLS( Text )
+
+ private:
+ RefPtr<GL::Label> m_label;
+
+}; // class Label
+
+}; // namespace GUI
+
+}; // namespace Tiki
+
+#endif // __TIKI_GUI_TEXT_H
\ No newline at end of file
Added: tiki/include/Tiki/gui/widget.h
===================================================================
--- tiki/include/Tiki/gui/widget.h (rev 0)
+++ tiki/include/Tiki/gui/widget.h 2007-11-22 08:18:01 UTC (rev 547)
@@ -0,0 +1,74 @@
+/*
+ Tiki
+
+ widget.h
+
+ Copyright (C)2007 Atani Software
+*/
+
+#ifndef __TIKI_GUI_WIDGET_H
+#define __TIKI_GUI_WIDGET_H
+
+#include "Tiki/object.h"
+#include "Tiki/vector.h"
+#include "Tiki/drawable.h"
+#include "Tiki/list.h"
+#include "Tiki/hid.h"
+
+namespace Tiki {
+
+namespace GUI {
+
+/**
+ *
+ *
+ */
+class Widget : public Object {
+ public:
+ Widget(const std::string name) : m_name(name) { }
+ virtual ~Widget() {}
+
+ virtual void render(GL::Drawable::ObjType mode) { }
+
+ const std::string & getName() const {
+ return m_name;
+ }
+
+ const Widget * getParent() const {
+ return m_parent;
+ }
+
+ const Vector & getPosition() const;
+
+ const Vector & getTranslate() const {
+ return m_trans;
+ }
+
+ void setTranslate(const Vector & trans) {
+ m_trans = trans;
+ }
+
+ /// Add a new Widget
+ void addChild( Widget *t );
+
+ /// Remove a child Widget
+ void removeChild( Widget * t );
+
+ virtual void processEvent(const Hid::Event & event) { }
+
+ protected:
+ TIKI_OBJECT_DECLS( Widget )
+ std::string m_name;
+ Vector m_trans;
+ mutable Vector m_cachedPos;
+
+ private:
+ Widget *m_parent;
+ List<Tiki::GUI::Widget> m_children;
+}; // class Widget
+
+}; // namespace GUI
+
+}; // namespace Tiki
+
+#endif // __TIKI_GUI_WIDGET_H
\ No newline at end of file
Added: tiki/include/Tiki/gui/window.h
===================================================================
--- tiki/include/Tiki/gui/window.h (rev 0)
+++ tiki/include/Tiki/gui/window.h 2007-11-22 08:18:01 UTC (rev 547)
@@ -0,0 +1,52 @@
+/*
+ Tiki
+
+ window.h
+
+ Copyright (C)2007 Atani Software
+*/
+
+#ifndef __TIKI_GUI_WINDOW_H
+#define __TIKI_GUI_WINDOW_H
+
+#include "Tiki/hid.h"
+#include "Tiki/list.h"
+#include "Tiki/eventcollector.h"
+#include "Tiki/gui/container.h"
+
+namespace Tiki {
+
+namespace GUI {
+
+/**
+ *
+ *
+ */
+class Window : public Widget {
+ public:
+ Window();
+ virtual ~Window();
+
+ void run();
+
+ bool isActive() const {
+ return m_active;
+ }
+
+ void setActive(bool active = true) {
+ m_active = active;
+ }
+
+ protected:
+ TIKI_OBJECT_DECLS( Window )
+
+ private:
+ RefPtr<Hid::EventCollector> m_ec;
+ bool m_active;
+};
+
+}; // namespace GUI
+
+}; // namespace Tiki
+
+#endif // __TIKI_GUI_WINDOW_H
\ No newline at end of file
Modified: tiki/osx/Tiki.xcodeproj/project.pbxproj
===================================================================
--- tiki/osx/Tiki.xcodeproj/project.pbxproj 2007-11-15 18:21:33 UTC (rev 546)
+++ tiki/osx/Tiki.xcodeproj/project.pbxproj 2007-11-22 08:18:01 UTC (rev 547)
@@ -14,11 +14,23 @@
2290A10109302D9F00B7D80C /* cursor.h in Headers */ = {isa = PBXBuildFile; fileRef = 2290A0FF09302D9F00B7D80C /* cursor.h */; };
2290A10209302D9F00B7D80C /* pointerArrow.h in Headers */ = {isa = PBXBuildFile; fileRef = 2290A10009302D9F00B7D80C /* pointerArrow.h */; };
6400608E0CDF9DC800969916 /* init_flags_default.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6400608D0CDF9DC800969916 /* init_flags_default.cpp */; };
+ 6406D0440CF3C737002D832F /* button.h in Headers */ = {isa = PBXBuildFile; fileRef = 6406D0430CF3C737002D832F /* button.h */; };
+ 6406D04D0CF3CBEC002D832F /* widget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6406D04B0CF3CBEC002D832F /* widget.cpp */; };
+ 6406D0540CF3CDF6002D832F /* button.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6406D0530CF3CDF6002D832F /* button.cpp */; };
640C2C30092EB8C40032DE40 /* alpharotate.h in Headers */ = {isa = PBXBuildFile; fileRef = 640C2C2F092EB8C40032DE40 /* alpharotate.h */; };
+ 642E949A0CF54A780005C8A5 /* radiobutton.h in Headers */ = {isa = PBXBuildFile; fileRef = 642E94990CF54A780005C8A5 /* radiobutton.h */; };
+ 642E949E0CF54B550005C8A5 /* window.h in Headers */ = {isa = PBXBuildFile; fileRef = 642E949D0CF54B550005C8A5 /* window.h */; };
+ 642E94AE0CF54DB90005C8A5 /* radiobutton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 642E94AD0CF54DB90005C8A5 /* radiobutton.cpp */; };
+ 642E94D00CF54EF10005C8A5 /* window.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 642E94CF0CF54EF10005C8A5 /* window.cpp */; };
+ 642E94E50CF54FF20005C8A5 /* text.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 642E94E40CF54FF20005C8A5 /* text.cpp */; };
+ 642E94E80CF5501D0005C8A5 /* graphic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 642E94E70CF5501D0005C8A5 /* graphic.cpp */; };
+ 642E95860CF561D20005C8A5 /* spinner.h in Headers */ = {isa = PBXBuildFile; fileRef = 642E95850CF561D20005C8A5 /* spinner.h */; };
+ 642E958B0CF5642F0005C8A5 /* spinner.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 642E958A0CF5642F0005C8A5 /* spinner.cpp */; };
6444BEE60932A3D800A29768 /* texturetile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6444BEE50932A3D700A29768 /* texturetile.cpp */; };
6444BEE80932A3F200A29768 /* texturetile.h in Headers */ = {isa = PBXBuildFile; fileRef = 6444BEE70932A3F200A29768 /* texturetile.h */; };
644D23550CDFE82D00E7F291 /* lightbarmenu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 644D23540CDFE82D00E7F291 /* lightbarmenu.cpp */; };
644D23570CDFE83C00E7F291 /* lightbarmenu.h in Headers */ = {isa = PBXBuildFile; fileRef = 644D23560CDFE83C00E7F291 /* lightbarmenu.h */; };
+ 64618A5B0CEBE9A000881556 /* widget.h in Headers */ = {isa = PBXBuildFile; fileRef = 64618A5A0CEBE9A000881556 /* widget.h */; };
6499FE6A0C862377008D9FEF /* tinyxml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6499FE660C862377008D9FEF /* tinyxml.cpp */; };
6499FE6B0C862377008D9FEF /* tinyxml.h in Headers */ = {isa = PBXBuildFile; fileRef = 6499FE670C862377008D9FEF /* tinyxml.h */; };
6499FE6C0C862377008D9FEF /* tinyxmlerror.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6499FE680C862377008D9FEF /* tinyxmlerror.cpp */; };
@@ -51,6 +63,8 @@
64ED762A0C7CFB7E00D16D5C /* net.h in Headers */ = {isa = PBXBuildFile; fileRef = 64ED76280C7CFB7E00D16D5C /* net.h */; };
64ED762C0C7CFB9400D16D5C /* platnet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 64ED762B0C7CFB9400D16D5C /* platnet.cpp */; };
64ED762E0C7CFBA100D16D5C /* platnet.h in Headers */ = {isa = PBXBuildFile; fileRef = 64ED762D0C7CFBA100D16D5C /* platnet.h */; };
+ 64F19E9A0CF5391F0093AEAD /* text.h in Headers */ = {isa = PBXBuildFile; fileRef = 64F19E990CF5391F0093AEAD /* text.h */; };
+ 64F19ECB0CF53D740093AEAD /* graphic.h in Headers */ = {isa = PBXBuildFile; fileRef = 64F19ECA0CF53D740093AEAD /* graphic.h */; };
8DC2EF530486A6940098B216 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C1666FE841158C02AAC07 /* InfoPlist.strings */; };
8DC2EF570486A6940098B216 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */; };
C4287F7C07C9491100D238E1 /* image.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C4287F7B07C9491100D238E1 /* image.cpp */; };
@@ -214,11 +228,23 @@
2290A10009302D9F00B7D80C /* pointerArrow.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = pointerArrow.h; path = ../include/Tiki/drawables/pointerArrow.h; sourceTree = SOURCE_ROOT; };
32DBCF5E0370ADEE00C91783 /* Tiki_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Tiki_Prefix.pch; sourceTree = "<group>"; };
6400608D0CDF9DC800969916 /* init_flags_default.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = init_flags_default.cpp; sourceTree = "<group>"; };
+ 6406D0430CF3C737002D832F /* button.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = button.h; path = ../include/Tiki/gui/button.h; sourceTree = SOURCE_ROOT; };
+ 6406D04B0CF3CBEC002D832F /* widget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = widget.cpp; path = ../src/gui/widget.cpp; sourceTree = SOURCE_ROOT; };
+ 6406D0530CF3CDF6002D832F /* button.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = button.cpp; path = ../src/gui/button.cpp; sourceTree = SOURCE_ROOT; };
640C2C2F092EB8C40032DE40 /* alpharotate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = alpharotate.h; path = ../include/Tiki/anims/alpharotate.h; sourceTree = SOURCE_ROOT; };
+ 642E94990CF54A780005C8A5 /* radiobutton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = radiobutton.h; path = ../include/Tiki/gui/radiobutton.h; sourceTree = SOURCE_ROOT; };
+ 642E949D0CF54B550005C8A5 /* window.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = window.h; path = ../include/Tiki/gui/window.h; sourceTree = SOURCE_ROOT; };
+ 642E94AD0CF54DB90005C8A5 /* radiobutton.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = radiobutton.cpp; path = ../src/gui/radiobutton.cpp; sourceTree = SOURCE_ROOT; };
+ 642E94CF0CF54EF10005C8A5 /* window.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = window.cpp; path = ../src/gui/window.cpp; sourceTree = SOURCE_ROOT; };
+ 642E94E40CF54FF20005C8A5 /* text.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = text.cpp; path = ../src/gui/text.cpp; sourceTree = SOURCE_ROOT; };
+ 642E94E70CF5501D0005C8A5 /* graphic.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = graphic.cpp; path = ../src/gui/graphic.cpp; sourceTree = SOURCE_ROOT; };
+ 642E95850CF561D20005C8A5 /* spinner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = spinner.h; path = ../include/Tiki/gui/spinner.h; sourceTree = SOURCE_ROOT; };
+ 642E958A0CF5642F0005C8A5 /* spinner.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = spinner.cpp; path = ../src/gui/spinner.cpp; sourceTree = SOURCE_ROOT; };
6444BEE50932A3D700A29768 /* texturetile.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = texturetile.cpp; path = ../src/gl/drawables/texturetile.cpp; sourceTree = SOURCE_ROOT; };
6444BEE70932A3F200A29768 /* texturetile.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = texturetile.h; path = ../include/Tiki/drawables/texturetile.h; sourceTree = SOURCE_ROOT; };
644D23540CDFE82D00E7F291 /* lightbarmenu.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = lightbarmenu.cpp; path = ../src/gl/drawables/lightbarmenu.cpp; sourceTree = SOURCE_ROOT; };
644D23560CDFE83C00E7F291 /* lightbarmenu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lightbarmenu.h; path = ../include/Tiki/drawables/lightbarmenu.h; sourceTree = SOURCE_ROOT; };
+ 64618A5A0CEBE9A000881556 /* widget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = widget.h; path = ../include/Tiki/gui/widget.h; sourceTree = SOURCE_ROOT; };
6499FE660C862377008D9FEF /* tinyxml.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = tinyxml.cpp; path = ../3rdparty/tinyxml/tinyxml.cpp; sourceTree = SOURCE_ROOT; };
6499FE670C862377008D9FEF /* tinyxml.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = tinyxml.h; path = ../3rdparty/tinyxml/tinyxml.h; sourceTree = SOURCE_ROOT; };
6499FE680C862377008D9FEF /* tinyxmlerror.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = tinyxmlerror.cpp; path = ../3rdparty/tinyxml/tinyxmlerror.cpp; sourceTree = SOURCE_ROOT; };
@@ -251,6 +277,8 @@
64ED76280C7CFB7E00D16D5C /* net.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = net.h; path = ../include/Tiki/net.h; sourceTree = SOURCE_ROOT; };
64ED762B0C7CFB9400D16D5C /* platnet.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = platnet.cpp; path = src/platnet.cpp; sourceTree = "<group>"; };
64ED762D0C7CFBA100D16D5C /* platnet.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = platnet.h; path = include/Tiki/platnet.h; sourceTree = "<group>"; };
+ 64F19E990CF5391F0093AEAD /* text.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = text.h; path = ../include/Tiki/gui/text.h; sourceTree = SOURCE_ROOT; };
+ 64F19ECA0CF53D740093AEAD /* graphic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = graphic.h; path = ../include/Tiki/gui/graphic.h; sourceTree = SOURCE_ROOT; };
8DC2EF5A0486A6940098B216 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
8DC2EF5B0486A6940098B216 /* Tiki.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Tiki.framework; sourceTree = BUILT_PRODUCTS_DIR; };
C40D72C1083723B50084B52D /* design_v2.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = design_v2.rtf; path = ../notes/design_v2.rtf; sourceTree = SOURCE_ROOT; };
@@ -540,6 +568,34 @@
name = "Other Sources";
sourceTree = "<group>";
};
+ 6406D0490CF3CBCE002D832F /* gui */ = {
+ isa = PBXGroup;
+ children = (
+ 6406D0530CF3CDF6002D832F /* button.cpp */,
+ 642E94E70CF5501D0005C8A5 /* graphic.cpp */,
+ 642E94AD0CF54DB90005C8A5 /* radiobutton.cpp */,
+ 642E958A0CF5642F0005C8A5 /* spinner.cpp */,
+ 642E94E40CF54FF20005C8A5 /* text.cpp */,
+ 6406D04B0CF3CBEC002D832F /* widget.cpp */,
+ 642E94CF0CF54EF10005C8A5 /* window.cpp */,
+ );
+ name = gui;
+ sourceTree = "<group>";
+ };
+ 64618A590CEBE97000881556 /* gui */ = {
+ isa = PBXGroup;
+ children = (
+ 64618A5A0CEBE9A000881556 /* widget.h */,
+ 6406D0430CF3C737002D832F /* button.h */,
+ 64F19E990CF5391F0093AEAD /* text.h */,
+ 64F19ECA0CF53D740093AEAD /* graphic.h */,
+ 642E94990CF54A780005C8A5 /* radiobutton.h */,
+ 642E949D0CF54B550005C8A5 /* window.h */,
+ 642E95850CF561D20005C8A5 /* spinner.h */,
+ );
+ name = gui;
+ sourceTree = "<group>";
+ };
6499FE520C8622D4008D9FEF /* tinyXML */ = {
isa = PBXGroup;
children = (
@@ -623,14 +679,15 @@
C42BD273078FC90300061670 /* Include */ = {
isa = PBXGroup;
children = (
- 64ED76110C7CFB2200D16D5C /* net */,
C4AD531B0793CF3400E1B779 /* AutoIncluded */,
C48ACAD2079B7121005DF20E /* audio */,
C4AD50FD0793ABEC00E1B779 /* base */,
C4F5155B079A0BDD0001D0D0 /* gl */,
+ 64618A590CEBE97000881556 /* gui */,
C4539918079A44B300F3A584 /* hid */,
C48814E4079F88460038D5B0 /* image */,
C4F51576079A0C9A0001D0D0 /* math */,
+ 64ED76110C7CFB2200D16D5C /* net */,
);
name = Include;
sourceTree = "<group>";
@@ -638,13 +695,14 @@
C42BD2AD078FC94800061670 /* Source */ = {
isa = PBXGroup;
children = (
- 64ED75F00C7CFAC500D16D5C /* net */,
C4AD52E30793CDC100E1B779 /* audio */,
C42BD2D6078FC9BF00061670 /* base */,
C4F51516079A0B1C0001D0D0 /* gl */,
+ 6406D0490CF3CBCE002D832F /* gui */,
C4539923079A455600F3A584 /* hid */,
C48814FE079F8A3B0038D5B0 /* image */,
C4F5157D079A0CFB0001D0D0 /* math */,
+ 64ED75F00C7CFAC500D16D5C /* net */,
C472B72C079B0FBA00F0C00A /* thread */,
);
name = Source;
@@ -1150,6 +1208,13 @@
6499FE770C8623D6008D9FEF /* date.h in Headers */,
6499FEA40C8640CA008D9FEF /* cookiejar.h in Headers */,
644D23570CDFE83C00E7F291 /* lightbarmenu.h in Headers */,
+ 64618A5B0CEBE9A000881556 /* widget.h in Headers */,
+ 6406D0440CF3C737002D832F /* button.h in Headers */,
+ 64F19E9A0CF5391F0093AEAD /* text.h in Headers */,
+ 64F19ECB0CF53D740093AEAD /* graphic.h in Headers */,
+ 642E949A0CF54A780005C8A5 /* radiobutton.h in Headers */,
+ 642E949E0CF54B550005C8A5 /* window.h in Headers */,
+ 642E95860CF561D20005C8A5 /* spinner.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1374,6 +1439,13 @@
6499FEA60C8640E5008D9FEF /* cookiejar.cpp in Sources */,
6400608E0CDF9DC800969916 /* init_flags_default.cpp in Sources */,
644D23550CDFE82D00E7F291 /* lightbarmenu.cpp in Sources */,
+ 6406D04D0CF3CBEC002D832F /* widget.cpp in Sources */,
+ 6406D0540CF3CDF6002D832F /* button.cpp in Sources */,
+ 642E94AE0CF54DB90005C8A5 /* radiobutton.cpp in Sources */,
+ 642E94D00CF54EF10005C8A5 /* window.cpp in Sources */,
+ 642E94E50CF54FF20005C8A5 /* text.cpp in Sources */,
+ 642E94E80CF5501D0005C8A5 /* graphic.cpp in Sources */,
+ 642E958B0CF5642F0005C8A5 /* spinner.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Added: tiki/src/gui/button.cpp
===================================================================
--- tiki/src/gui/button.cpp (rev 0)
+++ tiki/src/gui/button.cpp 2007-11-22 08:18:01 UTC (rev 547)
@@ -0,0 +1,23 @@
+/*
+ Tiki
+
+ button.cpp
+
+ Copyright (C)2007 Atani Software
+*/
+
+#include "pch.h"
+#include "Tiki/widget.h"
+#include "Tiki/button.h"
+
+using namespace Tiki::GUI;
+using namespace Tiki::GL;
+
+TIKI_OBJECT_NAME( Button )
+TIKI_OBJECT_BEGIN( Widget, Button )
+TIKI_OBJECT_OUTLET( "click" )
+TIKI_OBJECT_END( Button )
+
+void Button::render(Drawable::ObjType mode) {
+
+}
\ No newline at end of file
Added: tiki/src/gui/graphic.cpp
===================================================================
--- tiki/src/gui/graphic.cpp (rev 0)
+++ tiki/src/gui/graphic.cpp 2007-11-22 08:18:01 UTC (rev 547)
@@ -0,0 +1,22 @@
+/*
+ Tiki
+
+ graphic.cpp
+
+ Copyright (C)2007 Atani Software
+*/
+
+#include "pch.h"
+#include "Tiki/graphic.h"
+
+using namespace Tiki::GUI;
+using namespace Tiki::GL;
+
+TIKI_OBJECT_NAME( Graphic )
+TIKI_OBJECT_BEGIN( Widget, Graphic )
+TIKI_OBJECT_OUTLET( "click" )
+TIKI_OBJECT_END( Graphic )
+
+void Graphic::render(Drawable::ObjType mode) {
+
+}
\ No newline at end of file
Added: tiki/src/gui/radiobutton.cpp
===================================================================
--- tiki/src/gui/radiobutton.cpp (rev 0)
+++ tiki/src/gui/radiobutton.cpp 2007-11-22 08:18:01 UTC (rev 547)
@@ -0,0 +1,31 @@
+/*
+ Tiki
+
+ radiobutton.cpp
+
+ Copyright (C)2007 Atani Software
+*/
+
+#include "pch.h"
+#include "Tiki/radiobutton.h"
+
+using namespace Tiki::GUI;
+using namespace Tiki::GL;
+
+TIKI_OBJECT_NAME( RadioButton )
+TIKI_OBJECT_BEGIN( Widget, RadioButton )
+TIKI_OBJECT_OUTLET( "select" )
+TIKI_OBJECT_END( RadioButton )
+
+TIKI_OBJECT_NAME( RadioButtonGroup )
+TIKI_OBJECT_BEGIN( Widget, RadioButtonGroup )
+TIKI_OBJECT_OUTLET( "selection_change" )
+TIKI_OBJECT_END( RadioButtonGroup )
+
+void RadioButton::render(Drawable::ObjType mode) {
+
+}
+
+void RadioButtonGroup::render(Drawable::ObjType mode) {
+
+}
\ No newline at end of file
Added: tiki/src/gui/spinner.cpp
===================================================================
--- tiki/src/gui/spinner.cpp (rev 0)
+++ tiki/src/gui/spinner.cpp 2007-11-22 08:18:01 UTC (rev 547)
@@ -0,0 +1,22 @@
+/*
+ Tiki
+
+ spinner.cpp
+
+ Copyright (C)2007 Atani Software
+*/
+
+#include "pch.h"
+#include "Tiki/spinner.h"
+
+using namespace Tiki::GUI;
+using namespace Tiki::GL;
+
+TIKI_OBJECT_NAME( Spinner )
+TIKI_OBJECT_BEGIN( Widget, Spinner )
+TIKI_OBJECT_OUTLET( "valueChange" )
+TIKI_OBJECT_END( Spinner )
+
+void Spinner::render(Drawable::ObjType mode) {
+
+}
\ No newline at end of file
Added: tiki/src/gui/text.cpp
===================================================================
--- tiki/src/gui/text.cpp (rev 0)
+++ tiki/src/gui/text.cpp 2007-11-22 08:18:01 UTC (rev 547)
@@ -0,0 +1,21 @@
+/*
+ Tiki
+
+ text.cpp
+
+ Copyright (C)2007 Atani Software
+*/
+
+#include "pch.h"
+#include "Tiki/text.h"
+
+using namespace Tiki::GUI;
+using namespace Tiki::GL;
+
+TIKI_OBJECT_NAME( Text )
+TIKI_OBJECT_BEGIN( Widget, Text )
+TIKI_OBJECT_END( Text )
+
+void Text::render(Drawable::ObjType mode) {
+
+}
\ No newline at end of file
Added: tiki/src/gui/widget.cpp
===================================================================
--- tiki/src/gui/widget.cpp (rev 0)
+++ tiki/src/gui/widget.cpp 2007-11-22 08:18:01 UTC (rev 547)
@@ -0,0 +1,25 @@
+/*
+ Tiki
+
+ widget.cpp
+
+ Copyright (C)2007 Atani Software
+*/
+
+#include "pch.h"
+#include "Tiki/widget.h"
+
+using namespace Tiki::GUI;
+
+TIKI_OBJECT_NAME( Widget )
+TIKI_OBJECT_BEGIN( Object, Widget )
+TIKI_OBJECT_END( Widget )
+
+const Vector & Widget::getPosition() const {
+ Vector pos = getTranslate();
+ if(m_parent) {
+ pos += m_trans;
+ }
+ m_cachedPos = pos;
+ return m_cachedPos;
+}
\ No newline at end of file
Added: tiki/src/gui/widget.h
===================================================================
--- tiki/src/gui/widget.h (rev 0)
+++ tiki/src/gui/widget.h 2007-11-22 08:18:01 UTC (rev 547)
@@ -0,0 +1,9 @@
+/*
+ * widget.h
+ * Tiki
+ *
+ * Created by Atani on 11/20/07.
+ * Copyright 2007 __MyCompanyName__. All rights reserved.
+ *
+ */
+
Added: tiki/src/gui/window.cpp
===================================================================
--- tiki/src/gui/window.cpp (rev 0)
+++ tiki/src/gui/window.cpp 2007-11-22 08:18:01 UTC (rev 547)
@@ -0,0 +1,22 @@
+/*
+ Tiki
+
+ window.cpp
+
+ Copyright (C)2007 Atani Software
+*/
+
+#include "pch.h"
+#include "Tiki/window.h"
+
+using namespace Tiki::GUI;
+
+TIKI_OBJECT_NAME( Window )
+TIKI_OBJECT_BEGIN( Widget, Window )
+TIKI_OBJECT_OUTLET( "idle" )
+TIKI_OBJECT_OUTLET( "inputEvent" )
+TIKI_OBJECT_END( Window )
+
+void Window::run() {
+
+}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
