reflexion 0.1.12 → 0.1.13

data/include/reflex/selector.h

@@ -6,7 +6,6 @@
 
 #include <set>
 #include <xot/pimpl.h>
-#include <xot/string.h>
 #include <reflex/defs.h>
 
 
@@ -14,6 +13,9 @@ namespace Reflex
 {
 
 
+	class SelectorPtr;
+
+
 	class Selector
 	{
 
@@ -41,6 +43,10 @@ namespace Reflex
 
 			void remove_tag (const char* tag);
 
+			void  clear_tags ();
+
+			bool    has_tag (const char* tag) const;
+
 			      iterator begin ();
 
 			const_iterator begin () const;
@@ -59,11 +65,57 @@ namespace Reflex
 
 			struct Data;
 
-			Xot::PImpl<Data, true> self;
+			Xot::PSharedImpl<Data> self;
 
 	};// Selector
 
 
+	class HasSelector
+	{
+
+		public:
+
+			typedef Selector::      iterator       tag_iterator;
+
+			typedef Selector::const_iterator const_tag_iterator;
+
+			virtual ~HasSelector ();
+
+			virtual void    set_name (const char* name);
+
+			virtual const char* name () const;
+
+			virtual void           add_tag (const char* tag);
+
+			virtual void        remove_tag (const char* tag);
+
+			virtual void         clear_tags ();
+
+			virtual bool           has_tag (const char* tag) const;
+
+			virtual       tag_iterator tag_begin ();
+
+			virtual const_tag_iterator tag_begin () const;
+
+			virtual       tag_iterator tag_end ();
+
+			virtual const_tag_iterator tag_end () const;
+
+			virtual void        set_selector (const Selector& selector);
+
+			virtual       Selector& selector ();
+
+			virtual const Selector& selector () const;
+
+		protected:
+
+			virtual       SelectorPtr* get_selector_ptr () = 0;
+
+			virtual const SelectorPtr* get_selector_ptr () const;
+
+	};// HasSelector
+
+
 }// Reflex
 
 

data/include/reflex/shape.h

@@ -0,0 +1,211 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __REFLEX_SHAPE_H__
+#define __REFLEX_SHAPE_H__
+
+
+#include <xot/ref.h>
+#include <xot/pimpl.h>
+#include <rays/bounds.h>
+#include <reflex/defs.h>
+#include <reflex/selector.h>
+
+
+namespace Reflex
+{
+
+
+	class Event;
+	struct DrawEvent;
+	struct FrameEvent;
+	struct ContactEvent;
+
+	class View;
+	class Fixture;
+
+
+	class Shape : public Xot::RefCountable<>, public HasSelector
+	{
+
+		typedef Shape This;
+
+		public:
+
+			typedef Xot::Ref<This> Ref;
+
+			virtual ~Shape ();
+
+			virtual       View* owner ();
+
+			virtual const View* owner () const;
+
+			        void set_frame (coord x, coord y, coord width, coord height);
+
+			virtual void set_frame (const Bounds& frame);
+
+			virtual Bounds   frame () const;
+
+			virtual void set_density (float density);
+
+			virtual float    density () const;
+
+			virtual void set_friction (float friction);
+
+			virtual float    friction () const;
+
+			virtual void set_restitution (float restitution);
+
+			virtual float    restitution () const;
+
+			virtual void set_sensor (bool state);
+
+			virtual bool  is_sensor () const;
+
+			virtual void set_category_bits (uint bits);
+
+			virtual uint     category_bits () const;
+
+			virtual void set_collision_mask (uint mask);
+
+			virtual uint     collision_mask () const;
+
+			virtual void on_draw   (DrawEvent* e);
+
+			virtual void on_resize (FrameEvent* e);
+
+			virtual void on_contact       (ContactEvent* e);
+
+			virtual void on_contact_begin (ContactEvent* e);
+
+			virtual void on_contact_end   (ContactEvent* e);
+
+			struct Data;
+
+			Xot::PImpl<Data> self;
+
+		protected:
+
+			Shape (Data* data, const char* name = NULL);
+
+			virtual SelectorPtr* get_selector_ptr ();
+
+	};// Shape
+
+
+	class PolygonShape : public Shape
+	{
+
+		typedef Shape Super;
+
+		public:
+
+			PolygonShape (const char* name = NULL);
+
+			virtual ~PolygonShape ();
+
+			virtual void       set_polygon (const Polygon& polygon);
+
+			virtual const Polygon& polygon () const;
+
+	};// PolygonShape
+
+
+	class LineShape : public Shape
+	{
+
+		typedef Shape Super;
+
+		public:
+
+			LineShape (const char* name = NULL);
+
+			virtual ~LineShape ();
+
+			virtual void add_point (coord x, coord y, coord z = 0);
+
+			virtual void add_point (const Point& point);
+
+			virtual void add_points (const Point* points, size_t size);
+
+			virtual void set_loop (bool loop = true);
+
+			virtual bool     loop () const;
+
+	};// LineShape
+
+
+	class RectShape : public Shape
+	{
+
+		typedef Shape Super;
+
+		public:
+
+			RectShape (const char* name = NULL);
+
+			virtual ~RectShape ();
+
+			virtual void set_round (coord round);
+
+			virtual void set_round (
+				coord left_top, coord right_top, coord left_bottom, coord right_bottom);
+
+			virtual void set_round_left_top (coord round);
+
+			virtual coord    round_left_top () const;
+
+			virtual void set_round_right_top (coord round);
+
+			virtual coord    round_right_top () const;
+
+			virtual void set_round_left_bottom (coord round);
+
+			virtual coord    round_left_bottom () const;
+
+			virtual void set_round_right_bottom (coord round);
+
+			virtual coord    round_right_bottom () const;
+
+			virtual void set_nsegment (uint num_of_segments);
+
+			virtual uint     nsegment () const;
+
+	};// RectShape
+
+
+	class EllipseShape : public Shape
+	{
+
+		typedef Shape Super;
+
+		public:
+
+			EllipseShape (const char* name = NULL);
+
+			virtual ~EllipseShape ();
+
+			virtual void     set_hole_size (coord width, coord height);
+
+			virtual void     set_hole_size (const Point& size);
+
+			virtual const Point& hole_size () const;
+
+			virtual void set_angle_from (float degree);
+
+			virtual float    angle_from () const;
+
+			virtual void set_angle_to (float degree);
+
+			virtual float    angle_to () const;
+
+			virtual void set_nsegment (uint num_of_segments);
+
+			virtual uint     nsegment() const;
+
+	};// EllipseShape
+
+
+}// Reflex
+
+
+#endif//EOH

data/include/reflex/style.h

@@ -5,8 +5,9 @@
 
 
 #include <xot/pimpl.h>
-#include <reflex/color.h>
-#include <reflex/image.h>
+#include <rays/color.h>
+#include <rays/image.h>
+#include <reflex/defs.h>
 #include <reflex/selector.h>
 
 
@@ -14,9 +15,6 @@ namespace Reflex
 {
 
 
-	class View;
-
-
 	class StyleLength
 	{
 
@@ -26,25 +24,17 @@ namespace Reflex
 
 			typedef coord Value;
 
-			enum Unit {NONE = 0, PIXEL, PERCENT, UNIT_LAST};
-
-			StyleLength ();
-
-			StyleLength (Value value, Unit unit = PIXEL);
+			enum Type {NONE = 0, PIXEL, PERCENT, FILL, FIT, TYPE_LAST};
 
-			explicit StyleLength (const char* str);
+			StyleLength (Type type = NONE, Value value = 0);
 
 			This copy () const;
 
-			void reset (Value value = 0, Unit unit = NONE);
-
-			void reset (const char* str);
+			void reset (Type type = NONE, Value value = 0);
 
 			Value value () const;
 
-			Unit unit () const;
-
-			String to_s () const;
+			Type type () const;
 
 			operator bool () const;
 
@@ -56,12 +46,12 @@ namespace Reflex
 
 			struct Data;
 
-			Xot::PImpl<Data, true> self;
+			Xot::PSharedImpl<Data> self;
 
 	};// StyleLength
 
 
-	class Style
+	class Style : public HasSelector
 	{
 
 		typedef Style This;
@@ -74,122 +64,162 @@ namespace Reflex
 				FLOW_LAST
 			};
 
-			typedef Selector::      iterator       tag_iterator;
-
-			typedef Selector::const_iterator const_tag_iterator;
-
 			Style (const char* name = NULL);
 
 			~Style ();
 
-			void    set_name (const char* name);
+			void set_name (const char* name);
+
+			void    add_tag (const char* tag);
+
+			void remove_tag (const char* tag);
+
+			void  clear_tags ();
+
+			void set_selector (const Selector& selector);
+
+			void   set_flow (Flow main, Flow sub = FLOW_NONE);
+
+			void clear_flow ();
+
+			void   get_flow (Flow* main, Flow* sub) const;
+
+			void           set_width (const StyleLength& width);
 
-			const char* name () const;
+			void         clear_width ();
 
-			void           add_tag (const char* tag);
+			const StyleLength& width () const;
 
-			void        remove_tag (const char* tag);
+			void           set_height (const StyleLength& height);
 
-			      tag_iterator tag_begin ();
+			void         clear_height ();
 
-			const_tag_iterator tag_begin () const;
+			const StyleLength& height () const;
 
-			      tag_iterator tag_end ();
+			void           set_left (const StyleLength& left);
 
-			const_tag_iterator tag_end () const;
+			void         clear_left ();
 
-			void        set_selector (const Selector& selector);
+			const StyleLength& left () const;
 
-			      Selector& selector ();
+			void           set_top (const StyleLength& top);
 
-			const Selector& selector () const;
+			void         clear_top ();
 
-			void set_flow (Flow main, Flow sub = FLOW_NONE);
+			const StyleLength& top () const;
 
-			void get_flow (Flow* main, Flow* sub) const;
+			void           set_right (const StyleLength& right);
 
-			void            set_width  (const StyleLength& width);
+			void         clear_right ();
 
-			void            set_height (const StyleLength& height);
+			const StyleLength& right () const;
 
-			const StyleLength&  width  () const;
+			void           set_bottom (const StyleLength& bottom);
 
-			const StyleLength&  height () const;
+			void         clear_bottom ();
 
-			void            set_left     (const StyleLength& left);
+			const StyleLength& bottom () const;
 
-			void            set_top      (const StyleLength& top);
+			void           set_margin_left (const StyleLength& left);
 
-			void            set_right    (const StyleLength& right);
+			void         clear_margin_left ();
 
-			void            set_bottom   (const StyleLength& bottom);
+			const StyleLength& margin_left () const;
 
-			const StyleLength&  left     () const;
+			void           set_margin_top (const StyleLength& top);
 
-			const StyleLength&  top      () const;
+			void         clear_margin_top ();
 
-			const StyleLength&  right    () const;
+			const StyleLength& margin_top () const;
 
-			const StyleLength&  bottom   () const;
+			void           set_margin_right (const StyleLength& right);
 
-			void            set_offset_left   (const StyleLength& left);
+			void         clear_margin_right ();
 
-			void            set_offset_top    (const StyleLength& top);
+			const StyleLength& margin_right () const;
 
-			void            set_offset_right  (const StyleLength& right);
+			void           set_margin_bottom (const StyleLength& bottom);
 
-			void            set_offset_bottom (const StyleLength& bottom);
+			void         clear_margin_bottom ();
 
-			const StyleLength&  offset_left   () const;
+			const StyleLength& margin_bottom () const;
 
-			const StyleLength&  offset_top    () const;
+			void           set_padding_left (const StyleLength& left);
 
-			const StyleLength&  offset_right  () const;
+			void         clear_padding_left ();
 
-			const StyleLength&  offset_bottom () const;
+			const StyleLength& padding_left () const;
 
-			void            set_margin_left   (const StyleLength& left);
+			void           set_padding_top (const StyleLength& top);
 
-			void            set_margin_top    (const StyleLength& top);
+			void         clear_padding_top ();
 
-			void            set_margin_right  (const StyleLength& right);
+			const StyleLength& padding_top () const;
 
-			void            set_margin_bottom (const StyleLength& bottom);
+			void           set_padding_right (const StyleLength& right);
 
-			const StyleLength&  margin_left   () const;
+			void         clear_padding_right ();
 
-			const StyleLength&  margin_top    () const;
+			const StyleLength& padding_right () const;
 
-			const StyleLength&  margin_right  () const;
+			void           set_padding_bottom (const StyleLength& bottom);
 
-			const StyleLength&  margin_bottom () const;
+			void         clear_padding_bottom ();
 
-			void            set_padding_left   (const StyleLength& left);
+			const StyleLength& padding_bottom () const;
 
-			void            set_padding_top    (const StyleLength& top);
+			void           set_center_x (const StyleLength& x);
 
-			void            set_padding_right  (const StyleLength& right);
+			void         clear_center_x ();
 
-			void            set_padding_bottom (const StyleLength& bottom);
+			const StyleLength& center_x () const;
 
-			const StyleLength&  padding_left   () const;
+			void           set_center_y (const StyleLength& y);
 
-			const StyleLength&  padding_top    () const;
+			void         clear_center_y ();
 
-			const StyleLength&  padding_right  () const;
+			const StyleLength& center_y () const;
 
-			const StyleLength&  padding_bottom () const;
+			void     set_foreground_fill (const Color& fill);
 
-			void     set_fill (const Color& fill);
+			void   clear_foreground_fill ();
 
-			const Color& fill () const;
+			const Color& foreground_fill () const;
 
-			void     set_stroke (const Color& stroke);
+			void     set_foreground_stroke (const Color& stroke);
 
-			const Color& stroke () const;
+			void   clear_foreground_stroke ();
+
+			const Color& foreground_stroke () const;
+
+			void     set_foreground_stroke_width (coord width);
+
+			void   clear_foreground_stroke_width ();
+
+			coord        foreground_stroke_width () const;
+
+			void     set_background_fill (const Color& fill);
+
+			void   clear_background_fill ();
+
+			const Color& background_fill () const;
+
+			void     set_background_stroke (const Color& stroke);
+
+			void   clear_background_stroke ();
+
+			const Color& background_stroke () const;
+
+			void     set_background_stroke_width (coord width);
+
+			void   clear_background_stroke_width ();
+
+			coord        background_stroke_width () const;
 
 			void     set_image (const Image& image);
 
+			void   clear_image ();
+
 			const Image& image () const;
 
 			friend bool operator == (const This& lhs, const This& rhs);
@@ -198,7 +228,11 @@ namespace Reflex
 
 			struct Data;
 
-			Xot::PImpl<Data, true> self;
+			Xot::PSharedImpl<Data> self;
+
+		protected:
+
+			virtual SelectorPtr* get_selector_ptr ();
 
 	};// Style
 

data/include/reflex/timer.h

@@ -0,0 +1,73 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __REFLEX_TIMER_H__
+#define __REFLEX_TIMER_H__
+
+
+#include <xot/ref.h>
+#include <xot/pimpl.h>
+#include <reflex/defs.h>
+#include <reflex/selector.h>
+
+
+namespace Reflex
+{
+
+
+	class View;
+
+
+	class Timer : public Xot::RefCountable<>, public HasSelector
+	{
+
+		typedef Timer This;
+
+		public:
+
+			typedef Xot::Ref<This> Ref;
+
+			enum {ID_INVALID = 0, ID_FIRST};
+
+			Timer ();
+
+			virtual ~Timer ();
+
+			virtual void fire ();
+
+			virtual void stop ();
+
+			virtual View* owner () const;
+
+			virtual int id () const;
+
+			virtual float interval () const;
+
+			virtual void set_count (int count);
+
+			virtual int      count () const;
+
+			virtual bool is_finished () const;
+
+			virtual operator bool () const;
+
+			virtual bool operator ! () const;
+
+			friend bool operator == (const This& lhs, const This& rhs);
+
+			friend bool operator != (const This& lhs, const This& rhs);
+
+			struct Data;
+
+			Xot::PImpl<Data> self;
+
+		protected:
+
+			virtual SelectorPtr* get_selector_ptr ();
+
+	};// Timer
+
+
+}// Reflex
+
+
+#endif//EOH