reflexion 0.1.10 → 0.1.11

data/ext/reflex/style_length.cpp

@@ -1,4 +1,4 @@
-#include "reflex/ruby/style_length.h"
+#include "reflex/ruby/style.h"
 
 
 #include <rucy.h>

data/ext/reflex/view.cpp

@@ -141,15 +141,17 @@ RUCY_DEF1(remove_style, style)
 RUCY_END
 
 static
-RUCY_DEFN(get_style)
+RUCY_DEF1(get_style, selector)
 {
 	CHECK;
-	check_arg_count(__FILE__, __LINE__, "View#get_style", argc, 0, 1);
 
-	if (argc == 0)
-		return value(THIS->style());
+	Reflex::Style* s = NULL;
+	if (selector)
+		s = THIS->get_style(to<Reflex::Selector>(selector), true);
 	else
-		return value(THIS->get_style(to<Reflex::Selector>(argv[0])));
+		s = THIS->style(true);
+
+	return s ? value(*s) : nil();
 }
 RUCY_END
 
@@ -320,6 +322,22 @@ RUCY_DEF0(get_frame)
 }
 RUCY_END
 
+static
+RUCY_DEF1(set_zoom, zoom)
+{
+	CHECK;
+	THIS->set_zoom(to<float>(zoom));
+}
+RUCY_END
+
+static
+RUCY_DEF0(get_zoom)
+{
+	CHECK;
+	return value(THIS->zoom());
+}
+RUCY_END
+
 static
 RUCY_DEF0(get_angle)
 {
@@ -709,6 +727,8 @@ Init_view ()
 	cView.define_method("selector",  get_selector);
 	cView.define_private_method("set_frame", set_frame);
 	cView.define_private_method("get_frame", get_frame);
+	cView.define_method("zoom=", set_zoom);
+	cView.define_method("zoom",  get_zoom);
 	cView.define_method("angle",  get_angle);
 	cView.define_method("scroll_to", scroll_to);
 	cView.define_method("scroll_by", scroll_by);

data/include/reflex/body.h

@@ -67,6 +67,18 @@ namespace Reflex
 
 			float    angular_velocity () const;
 
+			void apply_force (coord x, coord y);
+
+			void apply_force (const Point& force);
+
+			void apply_torque (float torque);
+
+			void apply_linear_impulse (coord x, coord y);
+
+			void apply_linear_impulse (const Point& impulse);
+
+			void apply_angular_impulse (float impulse);
+
 			void set_density (float density);
 
 			float    density () const;
@@ -79,6 +91,10 @@ namespace Reflex
 
 			float    restitution () const;
 
+			void set_gravity_scale (float scale);
+
+			float    gravity_scale () const;
+
 			      iterator begin ();
 
 			const_iterator begin () const;

data/include/reflex/ruby.h

@@ -5,14 +5,16 @@
 
 
 #include <reflex/ruby/reflex.h>
-#include <reflex/ruby/application.h>
-#include <reflex/ruby/window.h>
-#include <reflex/ruby/view.h>
 #include <reflex/ruby/selector.h>
 #include <reflex/ruby/style.h>
 #include <reflex/ruby/event.h>
 #include <reflex/ruby/body.h>
 #include <reflex/ruby/fixture.h>
+#include <reflex/ruby/application.h>
+#include <reflex/ruby/window.h>
+#include <reflex/ruby/view.h>
+#include <reflex/ruby/image_view.h>
+#include <reflex/ruby/shape_view.h>
 
 
 #endif//EOH

data/include/reflex/ruby/style.h

@@ -14,6 +14,9 @@ namespace Reflex
 {
 
 
+	Rucy::Class style_length_class ();
+	// class Reflex::StyleLength
+
 	Rucy::Class style_class ();
 	// class Reflex::Style
 
@@ -21,6 +24,8 @@ namespace Reflex
 }// Reflex
 
 
+RUCY_DECLARE_VALUE_FROM_TO(Reflex::StyleLength)
+
 RUCY_DECLARE_VALUE_FROM_TO(Reflex::Style)
 
 
@@ -28,6 +33,12 @@ namespace Rucy
 {
 
 
+	template <> inline Class
+	get_ruby_class<Reflex::StyleLength> ()
+	{
+		return Reflex::style_length_class();
+	}
+
 	template <> inline Class
 	get_ruby_class<Reflex::Style> ()
 	{

data/include/reflex/selector.h

@@ -29,6 +29,10 @@ namespace Reflex
 
 			Selector (const char* name = NULL);
 
+			This copy () const;
+
+			bool contains (const This& selector) const;
+
 			void    set_name (const char* name);
 
 			const char* name () const;
@@ -45,12 +49,14 @@ namespace Reflex
 
 			const_iterator end () const;
 
-			bool match (const This& obj) const;
+			bool is_empty () const;
 
 			friend bool operator == (const This& lhs, const This& rhs);
 
 			friend bool operator != (const This& lhs, const This& rhs);
 
+			friend bool operator < (const This& lhs, const This& rhs);
+
 			struct Data;
 
 			Xot::PImpl<Data, true> self;

data/include/reflex/style.h

@@ -4,17 +4,63 @@
 #define __REFLEX_STYLE_H__
 
 
-#include <xot/ref.h>
+#include <xot/pimpl.h>
 #include <reflex/color.h>
 #include <reflex/image.h>
 #include <reflex/selector.h>
-#include <reflex/style_length.h>
 
 
 namespace Reflex
 {
 
 
+	class View;
+
+
+	class StyleLength
+	{
+
+		typedef StyleLength This;
+
+		public:
+
+			typedef coord Value;
+
+			enum Unit {NONE = 0, PIXEL, PERCENT, UNIT_LAST};
+
+			StyleLength ();
+
+			StyleLength (Value value, Unit unit = PIXEL);
+
+			explicit StyleLength (const char* str);
+
+			This copy () const;
+
+			void reset (Value value = 0, Unit unit = NONE);
+
+			void reset (const char* str);
+
+			Value value () const;
+
+			Unit unit () const;
+
+			String to_s () const;
+
+			operator bool () const;
+
+			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, true> self;
+
+	};// StyleLength
+
+
 	class Style
 	{
 
@@ -22,7 +68,11 @@ namespace Reflex
 
 		public:
 
-			enum Flow {FLOW_NONE = 0, FLOW_DOWN, FLOW_RIGHT, FLOW_UP, FLOW_LEFT, FLOW_LAST};
+			enum Flow
+			{
+				FLOW_NONE = 0, FLOW_RIGHT, FLOW_DOWN, FLOW_LEFT, FLOW_UP,
+				FLOW_LAST
+			};
 
 			typedef Selector::      iterator       tag_iterator;
 
@@ -30,10 +80,6 @@ namespace Reflex
 
 			Style (const char* name = NULL);
 
-			Style (const This& obj);
-
-			Style& operator = (const This& obj);
-
 			~Style ();
 
 			void    set_name (const char* name);
@@ -62,27 +108,29 @@ namespace Reflex
 
 			void get_flow (Flow* main, Flow* sub) const;
 
-			void            set_size (const StyleLength2& size);
-
 			void            set_width  (const StyleLength& width);
 
 			void            set_height (const StyleLength& height);
 
-			const StyleLength2& size () const;
+			const StyleLength&  width  () const;
+
+			const StyleLength&  height () const;
 
-			void            set_position (const StyleLength4& position);
+			void            set_left     (const StyleLength& left);
 
-			void            set_left   (const StyleLength& left);
+			void            set_top      (const StyleLength& top);
 
-			void            set_top    (const StyleLength& top);
+			void            set_right    (const StyleLength& right);
 
-			void            set_right  (const StyleLength& right);
+			void            set_bottom   (const StyleLength& bottom);
 
-			void            set_bottom (const StyleLength& bottom);
+			const StyleLength&  left     () const;
 
-			const StyleLength4& position () const;
+			const StyleLength&  top      () const;
 
-			void            set_offset (const StyleLength4& offset);
+			const StyleLength&  right    () const;
+
+			const StyleLength&  bottom   () const;
 
 			void            set_offset_left   (const StyleLength& left);
 
@@ -92,9 +140,13 @@ namespace Reflex
 
 			void            set_offset_bottom (const StyleLength& bottom);
 
-			const StyleLength4& offset () const;
+			const StyleLength&  offset_left   () const;
+
+			const StyleLength&  offset_top    () const;
+
+			const StyleLength&  offset_right  () const;
 
-			void            set_margin (const StyleLength4& margin);
+			const StyleLength&  offset_bottom () const;
 
 			void            set_margin_left   (const StyleLength& left);
 
@@ -104,9 +156,13 @@ namespace Reflex
 
 			void            set_margin_bottom (const StyleLength& bottom);
 
-			const StyleLength4& margin () const;
+			const StyleLength&  margin_left   () const;
+
+			const StyleLength&  margin_top    () const;
+
+			const StyleLength&  margin_right  () const;
 
-			void            set_padding (const StyleLength4& padding);
+			const StyleLength&  margin_bottom () const;
 
 			void            set_padding_left   (const StyleLength& left);
 
@@ -116,15 +172,25 @@ namespace Reflex
 
 			void            set_padding_bottom (const StyleLength& bottom);
 
-			const StyleLength4& padding () const;
+			const StyleLength&  padding_left   () const;
+
+			const StyleLength&  padding_top    () const;
+
+			const StyleLength&  padding_right  () const;
+
+			const StyleLength&  padding_bottom () const;
+
+			void     set_fill (const Color& fill);
+
+			const Color& fill () const;
 
-			void     set_background_color (const Color& value);
+			void     set_stroke (const Color& stroke);
 
-			const Color& background_color () const;
+			const Color& stroke () const;
 
-			void     set_background_image (const Image& value);
+			void     set_image (const Image& image);
 
-			const Image& background_image () const;
+			const Image& image () const;
 
 			friend bool operator == (const This& lhs, const This& rhs);
 
@@ -132,7 +198,7 @@ namespace Reflex
 
 			struct Data;
 
-			Xot::Ref<Data> ref;
+			Xot::PImpl<Data, true> self;
 
 	};// Style
 

data/include/reflex/view.h

@@ -89,15 +89,15 @@ namespace Reflex
 
 			virtual const_child_iterator child_end () const;
 
-			virtual       Style&         style ();
+			virtual       Style*         style (bool create = false);
 
-			virtual const Style&         style () const;
+			virtual const Style*         style () const;
 
 			virtual void             add_style (const Style& style);
 
 			virtual void          remove_style (const Style& style);
 
-			virtual       Style*     get_style (const Selector& selector);
+			virtual       Style*     get_style (const Selector& selector, bool create = false);
 
 			virtual const Style*     get_style (const Selector& selector) const;
 
@@ -122,7 +122,7 @@ namespace Reflex
 
 			virtual Point content_size () const;
 
-			virtual void make_body ();
+			virtual void  make_body ();
 
 			virtual void clear_body ();
 
@@ -154,6 +154,10 @@ namespace Reflex
 
 			virtual const Bounds& frame () const;
 
+			virtual void set_zoom (float zoom);
+
+			virtual float    zoom () const;
+
 			virtual float angle () const;
 
 			virtual void         scroll_to (coord x, coord y, coord z = 0);

data/lib/reflex.rb

@@ -21,8 +21,6 @@ require 'reflex/helper'
 require 'reflex/selector'
 require 'reflex/style'
 require 'reflex/style_length'
-require 'reflex/style_length2'
-require 'reflex/style_length4'
 
 require 'reflex/update_event'
 require 'reflex/draw_event'

data/lib/reflex/body.rb

@@ -13,6 +13,7 @@ module Reflex
 
     alias velocity= linear_velocity=
     alias velocity  linear_velocity
+    alias apply_impulse apply_linear_impulse
     alias meter meter2pixel
 
   end# Body

data/lib/reflex/button.rb

@@ -16,6 +16,7 @@ module Reflex
     def initialize (*args, &block)
       self.data = false
       super
+      self.text = self.name unless self.text
     end
 
     def content_size ()

data/lib/reflex/selector.rb

@@ -15,14 +15,23 @@ module Reflex
     include Xot::Setter
     include HasTags
 
+    def self.selector (*args)
+      arg0 = args.first
+      arg0.kind_of?(Selector) ? arg0 : self.new(*args)
+    end
+
     def initialize (opts = {}, &block)
       super()
       set opts
       Xot::BlockUtil.instance_eval_or_block_call self, &block if block
     end
 
+    def to_s ()
+      "{name:#{name}, tags:[#{tags.to_a.join ', '}]}"
+    end
+
     def inspect ()
-      "#<#{self.class} name:'#{name}' tags:[#{tags.map{|s| "'#{s}'"}.to_a.join ','}]>"
+      "#<#{self.class} #{to_s}>"
     end
 
   end# Selector