reflexion 0.3.2 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44f9d83e30bdfb674c6f01ebed7a5446926fb746e32ddb235000afb58362abd1
-  data.tar.gz: 7f42b610bfa4aa457ebb1a41df20141502ed79f6fc8da03348d8625e64b2184e
+  metadata.gz: 92e1368f44fafa2ab8966bfec25f93af411b68a72eaf3f127bc6b95b97ba2fed
+  data.tar.gz: 6efaa218301242d6c4fea24062f9fd9d74f405e46a347eac1b231d6fe08a16c1
 SHA512:
-  metadata.gz: ce08093b3c3ab8d774202e3a939ba9b0b6bb8e993750bd011ebef460d387edb8cfbd15aa659682005fd03b0a7046114a57c620b1c823dcf34e4d81a796cc5306
-  data.tar.gz: f2d44deeb7570bd7533e4e29f169bd9967171cca102461c0a14a6966ced31cf33e4848185d872cf4ec8aa386dda41dc335f7f92235287ee5cdf002e00724c0d2
+  metadata.gz: 3886ea311fccd85da0e7e3868771d61d32f10fd091612bf306df041dbbe2cf30490e3e6a5fa9cdc049e6cf41f3b8e090ea7af950753dff81db95548ffcb7df99
+  data.tar.gz: 1704f273a82ebd9b8272e7358c6936b81171a969ad1a6f085ad641dc0f833dfeb5b97d4f5cf71e80be8d00d9b7bdbc5cb4bdba9d2c9e1228ebb6b995e7903444

data/.doc/ext/reflex/application.cpp

@@ -1,6 +1,7 @@
 #include "reflex/ruby/application.h"
 
 
+#include "reflex/ruby/window.h"
 #include "defs.h"
 
 
@@ -51,6 +52,17 @@ VALUE get_name(VALUE self)
 	return value(THIS->name());
 }
 
+static
+VALUE each_window(VALUE self)
+{
+	CHECK;
+
+	Value ret;
+	for (auto it = THIS->window_begin(), end = THIS->window_end(); it != end; ++it)
+		ret = rb_yield(value(it->get()));
+	return ret;
+}
+
 static
 VALUE on_start(VALUE self, VALUE event)
 {
@@ -110,6 +122,7 @@ Init_reflex_application ()
 	rb_define_method(cApplication, "quit", RUBY_METHOD_FUNC(quit), 0);
 	rb_define_method(cApplication, "name=", RUBY_METHOD_FUNC(set_name), 1);
 	rb_define_method(cApplication, "name", RUBY_METHOD_FUNC(get_name), 0);
+	rb_define_method(cApplication, "each_window", RUBY_METHOD_FUNC(each_window), 0);
 	rb_define_method(cApplication, "on_start", RUBY_METHOD_FUNC(on_start), 1);
 	rb_define_method(cApplication, "on_quit", RUBY_METHOD_FUNC(on_quit), 1);
 	rb_define_method(cApplication, "on_motion", RUBY_METHOD_FUNC(on_motion), 1);

data/ChangeLog.md

@@ -1,6 +1,23 @@
 # reflex ChangeLog
 
 
+## [v0.3.4] - 2025-03-07
+
+- Captured key and pointer events can be blocked before being sent to the window and views
+- Apply pixel<->meter scale to linear velocity and linear damping
+- Call awake() after moving the view
+
+- Fix an issue where capturing keys do not work
+
+
+## [v0.3.3] - 2025-01-23
+
+- Remove dependence on the beeps library
+- Add Application#windows
+
+- Fix frame rate limitation on Windows
+
+
 ## [v0.3.2] - 2025-01-14
 
 - Update workflow files

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.4

data/ext/reflex/application.cpp

@@ -1,6 +1,7 @@
 #include "reflex/ruby/application.h"
 
 
+#include "reflex/ruby/window.h"
 #include "defs.h"
 
 
@@ -56,6 +57,18 @@ RUCY_DEF0(get_name)
 }
 RUCY_END
 
+static
+RUCY_DEF0(each_window)
+{
+	CHECK;
+
+	Value ret;
+	for (auto it = THIS->window_begin(), end = THIS->window_end(); it != end; ++it)
+		ret = rb_yield(value(it->get()));
+	return ret;
+}
+RUCY_END
+
 static
 RUCY_DEF1(on_start, event)
 {
@@ -121,6 +134,7 @@ Init_reflex_application ()
 	cApplication.define_method("quit",  quit);
 	cApplication.define_method("name=", set_name);
 	cApplication.define_method("name",  get_name);
+	cApplication.define_method("each_window", each_window);
 	cApplication.define_method("on_start", on_start);
 	cApplication.define_method("on_quit",  on_quit);
 	cApplication.define_method("on_motion", on_motion);

data/ext/reflex/extconf.rb

@@ -13,9 +13,9 @@ require 'reflex/extension'
 Xot::ExtConf.new Xot, Rucy, Rays, Reflex do
   setup do
     headers    << 'ruby.h'
-    libs.unshift 'gdi32', 'opengl32', 'glew32'     if win32?
-    frameworks << 'Cocoa'                          if osx?
-    $LDFLAGS   << ' -Wl,--out-implib=native.dll.a' if mingw? || cygwin?
+    libs.unshift 'gdi32', 'winmm', 'opengl32', 'glew32' if win32?
+    frameworks << 'Cocoa'                               if osx?
+    $LDFLAGS   << ' -Wl,--out-implib=native.dll.a'      if mingw? || cygwin?
 
     unless osx?
       lib_dirs << Rays::Extension.ext_dir

data/include/reflex/application.h

@@ -4,9 +4,11 @@
 #define __REFLEX_APPLICATION_H__
 
 
+#include <vector>
 #include <xot/ref.h>
 #include <xot/pimpl.h>
 #include <reflex/defs.h>
+#include <reflex/window.h>
 #include <reflex/event.h>
 
 
@@ -23,6 +25,12 @@ namespace Reflex
 
 			typedef Xot::Ref<This> Ref;
 
+			typedef std::vector<Window::Ref> WindowList;
+
+			typedef WindowList::      iterator       window_iterator;
+
+			typedef WindowList::const_iterator const_window_iterator;
+
 			Application ();
 
 			virtual void start ();
@@ -33,6 +41,14 @@ namespace Reflex
 
 			virtual const char* name () const;
 
+			virtual       window_iterator window_begin ();
+
+			virtual const_window_iterator window_begin () const;
+
+			virtual       window_iterator window_end ();
+
+			virtual const_window_iterator window_end () const;
+
 			virtual void on_start (Event* e);
 
 			virtual void on_quit (Event* e);

data/include/reflex/view.h

@@ -59,30 +59,30 @@ namespace Reflex
 			enum Flag
 			{
 
-				FLAG_CLIP           = Xot::bit(0),
+				FLAG_CLIP          = Xot::bit(0),
 
-				FLAG_CACHE          = Xot::bit(1),
+				FLAG_CACHE         = Xot::bit(1),
 
-				FLAG_RESIZE_TO_FIT  = Xot::bit(2),
+				FLAG_RESIZE_TO_FIT = Xot::bit(2),
 
-				FLAG_SCROLL_TO_FIT  = Xot::bit(3),
+				FLAG_SCROLL_TO_FIT = Xot::bit(3),
 
-				FLAG_FIX_ANGLE      = Xot::bit(4),
+				FLAG_FIX_ANGLE     = Xot::bit(4),
 
-				FLAG_LAST           = FLAG_FIX_ANGLE
+				FLAG_LAST          = FLAG_FIX_ANGLE
 
 			};// Flag
 
 			enum Capture
 			{
 
-				CAPTURE_NONE      = 0,
+				CAPTURE_NONE    = 0,
 
-				CAPTURE_KEY       = Xot::bit(0),
+				CAPTURE_KEY     = Xot::bit(0),
 
-				CAPTURE_POINTER   = Xot::bit(1),
+				CAPTURE_POINTER = Xot::bit(1),
 
-				CAPTURE_ALL       = CAPTURE_KEY | CAPTURE_POINTER,
+				CAPTURE_ALL     = CAPTURE_KEY | CAPTURE_POINTER,
 
 			};// Capture
 

data/lib/reflex/application.rb

@@ -1,9 +1,9 @@
 require 'xot/setter'
 require 'xot/universal_accessor'
+require 'xot/hookable'
 require 'xot/block_util'
 require 'xot/inspectable'
 require 'reflex/ext'
-require 'reflex/helper'
 
 
 module Reflex
@@ -12,8 +12,8 @@ module Reflex
   class Application
 
     include Xot::Setter
+    include Xot::Hookable
     include Xot::Inspectable
-    include Hookable
 
     universal_accessor :name
 
@@ -23,6 +23,10 @@ module Reflex
       @start_block = block if block
     end
 
+    def windows()
+      to_enum :each_window
+    end
+
     def self.start(*args, &block)
       new(*args, &block).start
     end

data/lib/reflex/helper.rb

@@ -1,4 +1,3 @@
-require 'xot/hookable'
 require 'xot/universal_accessor'
 require 'reflex/point'
 require 'reflex/bounds'
@@ -7,17 +6,6 @@ require 'reflex/bounds'
 module Reflex
 
 
-  module Hookable
-
-    include Xot::Hookable
-
-    def hook(name, &block)
-      super "on_#{name}".intern, &block
-    end
-
-  end# Hookable
-
-
   module HasFrame
 
     def move_to(*args)

data/lib/reflex/shape.rb

@@ -1,5 +1,6 @@
 require 'xot/setter'
 require 'xot/universal_accessor'
+require 'xot/hookable'
 require 'xot/block_util'
 require 'reflex/ext'
 require 'reflex/helper'
@@ -11,7 +12,7 @@ module Reflex
   class Shape
 
     include Xot::Setter
-    include Hookable
+    include Xot::Hookable
     include HasFrame
     include HasTags
 

data/lib/reflex/view.rb

@@ -2,6 +2,7 @@ require 'forwardable'
 require 'xot/setter'
 require 'xot/bit_flag_accessor'
 require 'xot/universal_accessor'
+require 'xot/hookable'
 require 'xot/block_util'
 require 'reflex/ext'
 require 'reflex/selector'
@@ -16,7 +17,7 @@ module Reflex
   class View
 
     include Xot::Setter
-    include Hookable
+    include Xot::Hookable
     include HasFrame
     include HasTags
 
@@ -98,8 +99,14 @@ module Reflex
     end
 
     def capturing?(*args)
-      cap = capture
-      args.all? {|type| cap.include? type}
+      args, cap = args.flatten, capture
+      if args.empty?
+        not cap.empty?
+      elsif args.include?(:all)
+        cap == [:key, :pointer]
+      else
+        args.all? {|type| cap.include? type}
+      end
     end
 
     def on_contact(e)

data/lib/reflex/window.rb

@@ -2,6 +2,7 @@ require 'forwardable'
 require 'xot/setter'
 require 'xot/bit_flag_accessor'
 require 'xot/universal_accessor'
+require 'xot/hookable'
 require 'xot/block_util'
 require 'xot/inspectable'
 require 'reflex/ext'
@@ -14,8 +15,8 @@ module Reflex
   class Window
 
     include Xot::Setter
+    include Xot::Hookable
     include Xot::Inspectable
-    include Hookable
     include HasFrame
 
     extend Forwardable

data/lib/reflexion.rb

@@ -1,4 +1,3 @@
-require 'beeps'
 require 'rays'
 require 'reflex'
 
@@ -6,7 +5,7 @@ require 'reflex'
 module Reflexion
 
 
-  include Beeps, Rays, Reflex
+  include Rays, Reflex
 
 
   DEFAULTS = {

data/reflex.gemspec

@@ -25,10 +25,9 @@ Gem::Specification.new do |s|
   s.platform              = Gem::Platform::RUBY
   s.required_ruby_version = '>= 3.0.0'
 
-  s.add_dependency 'xot',   '~> 0.3.2', '>= 0.3.2'
-  s.add_dependency 'rucy',  '~> 0.3.2', '>= 0.3.2'
-  s.add_dependency 'beeps', '~> 0.3.2', '>= 0.3.2'
-  s.add_dependency 'rays',  '~> 0.3.2', '>= 0.3.2'
+  s.add_dependency 'xot',   '~> 0.3.4', '>= 0.3.4'
+  s.add_dependency 'rucy',  '~> 0.3.4', '>= 0.3.4'
+  s.add_dependency 'rays',  '~> 0.3.4', '>= 0.3.4'
 
   s.files            = `git ls-files`.split $/
   s.executables      = s.files.grep(%r{^bin/}) {|f| File.basename f}

data/src/application.cpp

@@ -0,0 +1,88 @@
+#include "application.h"
+
+
+#include "reflex/exception.h"
+#include "reflex/debug.h"
+#include "window.h"
+
+
+namespace Reflex
+{
+
+
+	namespace global
+	{
+
+		static Application* instance = NULL;
+
+	}// global
+
+
+	Application*
+	app ()
+	{
+		return global::instance;
+	}
+
+
+	Application::Application ()
+	:	self(Application_create_data())
+	{
+		if (global::instance)
+			reflex_error(__FILE__, __LINE__, "multiple application instances.");
+
+		global::instance = this;
+	}
+
+	Application::~Application ()
+	{
+		global::instance = NULL;
+	}
+
+	void
+	Application::set_name (const char* name)
+	{
+		if (!name)
+			argument_error(__FILE__, __LINE__);
+
+		self->name = name;
+	}
+
+	const char*
+	Application::name () const
+	{
+		return self->name.c_str();
+	}
+
+	Application::window_iterator
+	Application::window_begin ()
+	{
+		return Window_all().begin();
+	}
+
+	Application::const_window_iterator
+	Application::window_begin () const
+	{
+		return Window_all().begin();
+	}
+
+	Application::window_iterator
+	Application::window_end ()
+	{
+		return Window_all().end();
+	}
+
+	Application::const_window_iterator
+	Application::window_end () const
+	{
+		return Window_all().end();
+	}
+
+	bool
+	Application::operator ! () const
+	{
+		return !operator bool();
+	}
+
+
+}// Reflex

data/src/application.h

@@ -0,0 +1,28 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __REFLEX_SRC_APPLICATION_H__
+#define __REFLEX_SRC_APPLICATION_H__
+
+
+#include "reflex/application.h"
+
+
+namespace Reflex
+{
+
+
+	struct Application::Data
+	{
+
+		String name;
+
+	};// Application::Data
+
+
+	Application::Data* Application_create_data ();
+
+
+}// Reflex
+
+
+#endif//EOH

data/src/body.cpp

@@ -291,9 +291,7 @@ namespace Reflex
 		assert(b2to && b2from);
 
 		b2to->SetType(           b2from->GetType());
-		b2to->SetLinearVelocity( b2from->GetLinearVelocity());
 		b2to->SetAngularVelocity(b2from->GetAngularVelocity());
-		b2to->SetLinearDamping(  b2from->GetLinearDamping());
 		b2to->SetAngularDamping( b2from->GetAngularDamping());
 		b2to->SetGravityScale(   b2from->GetGravityScale());
 		b2to->SetBullet(         b2from->IsBullet());
@@ -301,12 +299,24 @@ namespace Reflex
 		float ppm_to   = to->self->ppm;
 		float ppm_from = from.self->ppm;
 		if (ppm_to == ppm_from)
-			b2to->SetTransform(b2from->GetPosition(), b2from->GetAngle());
+		{
+			b2to->SetTransform(     b2from->GetPosition(),
+			                        b2from->GetAngle());
+			b2to->SetLinearVelocity(b2from->GetLinearVelocity());
+			b2to->SetLinearDamping( b2from->GetLinearDamping());
+		}
 		else
 		{
-			auto pos = b2from->GetPosition();
-			pos *= ppm_from / ppm_to;
+			float scale = ppm_from / ppm_to;
+			auto pos    = b2from->GetPosition();
+			auto vel    = b2from->GetLinearVelocity();
+			auto damp   = b2from->GetLinearDamping();
+			pos  *= scale;
+			vel  *= scale;
+			damp *= scale;
 			b2to->SetTransform(pos, b2from->GetAngle());
+			b2to->SetLinearVelocity(vel);
+			b2to->SetLinearDamping(damp);
 		}
 	}
 

data/src/ios/app_delegate.mm

@@ -45,10 +45,11 @@
 		if (!app)
 			Reflex::argument_error(__FILE__, __LINE__);
 
-		if (app->self->delegate)
+		Reflex::ApplicationData& data = Reflex::Application_get_data(app);
+		if (data.delegate)
 			Reflex::invalid_state_error(__FILE__, __LINE__);
 
-		app->self->delegate = [self retain];
+		data.delegate = [self retain];
 		app->retain();
 
 		application = app;
@@ -58,10 +59,11 @@
 	{
 		if (!application) return;
 
-		if (application->self->delegate)
+		Reflex::ApplicationData& data = Reflex::Application_get_data(application);
+		if (data.delegate)
 		{
-			[application->self->delegate release];
-			application->self->delegate = nil;
+			[data.delegate release];
+			data.delegate = nil;
 		}
 
 		application->release();

data/src/ios/application.h

@@ -4,7 +4,7 @@
 #define __REFLEX_SRC_IOS_APPLICATION_H__
 
 
-#include "reflex/application.h"
+#include "../application.h"
 
 
 @class ReflexAppDelegate;
@@ -14,16 +14,19 @@ namespace Reflex
 {
 
 
-	struct Application::Data
+	struct ApplicationData : public Application::Data
 	{
 
 		ReflexAppDelegate* delegate;
 
-		String name;
+		ApplicationData ();
 
-		Data ();
+	};// ApplicationData
 
-	};// Application::Data
+
+	      ApplicationData& Application_get_data (      Application* app);
+
+	const ApplicationData& Application_get_data (const Application* app);
 
 
 }// Reflex

data/src/ios/application.mm

@@ -22,33 +22,33 @@ namespace Reflex
 {
 
 
-	namespace global
+	Application::Data*
+	Application_create_data ()
 	{
+		return new ApplicationData();
+	}
 
-		static Application* instance = NULL;
-
-	}// global
+	ApplicationData&
+	Application_get_data (Application* app)
+	{
+		if (!app)
+			argument_error(__FILE__, __LINE__);
 
+		return (ApplicationData&) *app->self;
+	}
 
-	Application*
-	app ()
+	const ApplicationData&
+	Application_get_data (const Application* app)
 	{
-		return global::instance;
+		return Application_get_data(const_cast<Application*>(app));
 	}
 
 
-	Application::Application ()
+	ApplicationData::ApplicationData ()
+	:	delegate(nil)
 	{
-		if (global::instance)
-			reflex_error(__FILE__, __LINE__, "multiple application instances.");
-
-		global::instance = this;
 	}
 
-	Application::~Application ()
-	{
-		global::instance = NULL;
-	}
 
 	void
 	Application::start ()
@@ -75,21 +75,6 @@ namespace Reflex
 		not_implemented_error(__FILE__, __LINE__);
 	}
 
-	void
-	Application::set_name (const char* name)
-	{
-		if (!name)
-			argument_error(__FILE__, __LINE__);
-
-		self->name = name;
-	}
-
-	const char*
-	Application::name () const
-	{
-		return self->name.c_str();
-	}
-
 	void
 	Application::on_start (Event* e)
 	{
@@ -120,17 +105,5 @@ namespace Reflex
 		return true;
 	}
 
-	bool
-	Application::operator ! () const
-	{
-		return !operator bool();
-	}
-
-
-	Application::Data::Data ()
-	:	delegate(nil)
-	{
-	}
-
 
 }// Reflex