reflexion 0.1.9.1 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9dd1aeeb46514d17e2381d407fe3d07d625ab604
-  data.tar.gz: 2bf4bee136f671bd4cafed5e72ea203a8b7139ce
+  metadata.gz: 2bbd862d88e6ae5162205e9b1656a23ce6f62a70
+  data.tar.gz: 48e9ec4d9ee31e1edc662d7fe7e17e134a2024af
 SHA512:
-  metadata.gz: b1031756b5177c025515d4ef9f779bf5801d87bc825017898f9c563b82236360d073acafd0ef93ba200cdf7e15d338d2441bda2a86b0d5b40480bcfacffdf524
-  data.tar.gz: a50fd79c95a90cf0308b672e6664c5b19ddfcce88eed3162e92ffd5a72dab27956a30135495b509d4b78660fdba247f6085df333d33a959e217a7f51b9e38ce7
+  metadata.gz: 5b8d6a218d4844bcda3f1faa9c6319c9708de00950e9d485e889ab43b184391ae4b13ead28b298942479de9f06c1a8c7c7d7cf9ec3b784a1ab51299a824024de
+  data.tar.gz: fe2306dac1b6d79b2e73848948392e82ad4ab9e65de34d50a6f0c38dcd597b2236dc8992b3a55d3e7e062f48c9f7cc483f1b87d9e9ce30ec9defb212dd8a30ae

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

@@ -12,6 +12,7 @@ RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(Reflex::Application)
 
 #define THIS      to<Reflex::Application*>(self)
 
+#define CHECK_OBJ RUCY_CHECK_OBJ(   Reflex::Application, self)
 #define CHECK     RUCY_CHECK_OBJECT(Reflex::Application, self)
 
 #define CALL(fun) RUCY_WRAPPER_CALL(Reflex::Application, THIS, fun)
@@ -26,7 +27,7 @@ VALUE alloc(VALUE klass)
 static
 VALUE start(VALUE self)
 {
-	CHECK;
+	CHECK_OBJ;
 	CALL(start());
 	return self;
 }

data/.doc/ext/reflex/native.cpp

@@ -41,7 +41,11 @@ void Init_arc_shape ();
 
 
 extern "C" void
-Init_native ()
+#ifdef COCOAPODS
+	Init_reflex_native ()
+#else
+	Init_native ()
+#endif
 {
 	RUCY_TRY
 

data/README.md

@@ -1,4 +1,4 @@
 
-# Reflex - A Graphical User Interface Tool Kit.
+# Reflex - A Graphical User Interface Tool Kit for Ruby.
 
-## by snori@xord.org
+ by snori@xord.org

data/VERSION

@@ -1 +1 @@
-0.1.9.1
+0.1.10

data/ext/reflex/application.cpp

@@ -12,6 +12,7 @@ RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(Reflex::Application)
 
 #define THIS      to<Reflex::Application*>(self)
 
+#define CHECK_OBJ RUCY_CHECK_OBJ(   Reflex::Application, self)
 #define CHECK     RUCY_CHECK_OBJECT(Reflex::Application, self)
 
 #define CALL(fun) RUCY_WRAPPER_CALL(Reflex::Application, THIS, fun)
@@ -27,7 +28,7 @@ RUCY_END
 static
 RUCY_DEF0(start)
 {
-	CHECK;
+	CHECK_OBJ;
 	CALL(start());
 	return self;
 }

data/ext/reflex/native.cpp

@@ -41,7 +41,11 @@ void Init_arc_shape ();
 
 
 extern "C" void
-Init_native ()
+#ifdef COCOAPODS
+	Init_reflex_native ()
+#else
+	Init_native ()
+#endif
 {
 	RUCY_TRY
 

data/lib/reflex/body.rb

@@ -11,6 +11,8 @@ module Reflex
 
     include Xot::Setter
 
+    alias velocity= linear_velocity=
+    alias velocity  linear_velocity
     alias meter meter2pixel
 
   end# Body

data/lib/reflex/view.rb

@@ -24,8 +24,8 @@ module Reflex
 
     def_delegators :body,
       :static=, :static?, :dynamic=, :dynamic?,
-      :linear_velocity=,  :linear_velocity,
-      :angular_velocity=, :angular_velocity,
+      :velocity=, :linear_velocity=, :angular_velocity=,
+      :velocity,  :linear_velocity,  :angular_velocity,
       :density=, :density, :friction=, :friction, :restitution=, :restitution
 
     alias add    add_child
@@ -70,6 +70,7 @@ module Reflex
     def gravity= (*args)
       case arg = args[0]
       when Point then set_gravity arg.x, arg.y
+      when Array then set_gravity arg[0], arg[1]
       else            set_gravity *args
       end
     end

data/lib/reflex/window.rb

@@ -23,6 +23,9 @@ module Reflex
       :add_child, :remove_child, :find_children, :style, :meter2pixel, :meter,
       :gravity=, :gravity, :wall, :debug=, :debug?
 
+    def_delegators :wall,
+      :friction=, :friction, :restitution=, :restitution
+
     alias add    add_child
     alias remove remove_child
     alias find   find_children

data/lib/reflexion.rb

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 
+require 'beeps'
 require 'rays'
 require 'reflex'
 
@@ -8,7 +9,7 @@ require 'reflex'
 module Reflexion
 
 
-  include Rays, Reflex
+  include Beeps, Rays, Reflex
 
 
   DEFAULTS = {
@@ -19,36 +20,33 @@ module Reflexion
 
   class MainWindow < Window
 
-    attr_accessor :update, :draw, :key, :pointer
-
-    attr_reader :setup
-
     attr_reader :event
 
-    def setup= (block)
-      @setup = block
-      call_event nil, self, &@setup
+    def initialize (*args, &block)
+      super
+      $window = self
+      call_event nil, self, &$setup
     end
 
     def on_update (e)
       super
       redraw
-      call_event e, e, &@update
+      call_event e, e, &$update
     end
 
     def on_draw (e)
       super
-      call_event e, e.painter, &@draw
+      call_event e, e.painter, &$draw
     end
 
     def on_key (e)
       super
-      call_event e, e, &@key
+      call_event e, e, &$key
     end
 
     def on_pointer (e)
       super
-      call_event e, e, &@pointer
+      call_event e, e, &$pointer
     end
 
     def call_event (event, *args, &block)
@@ -61,10 +59,8 @@ module Reflexion
 
   module_function
 
-  @@window = MainWindow.new DEFAULTS
-
   def window ()
-    @@window
+    $window ||= MainWindow.new DEFAULTS
   end
 
   def event ()
@@ -72,28 +68,27 @@ module Reflexion
   end
 
   def setup (&block)
-    window.setup = block
+    $setup = block
   end
 
   def update (&block)
-    window.update = block
+    $update = block
   end
 
   def draw (&block)
-    window.draw = block
+    $draw = block
   end
 
   def key (&block)
-    window.key = block
+    $key = block
   end
 
   def pointer (&block)
-    window.pointer = block
+    $pointer = block
   end
 
   def start ()
-    window.show
-    Reflex.start
+    Reflex.start {window.show}
   end
 
   def quit ()

data/reflex.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
 
   s.authors  = %w[snori]
   s.email    = 'snori@xord.org'
-  s.homepage = "https://github.com/xord/spacy/wiki/#{name.capitalize}-Home"
+  s.homepage = "https://github.com/xord/reflex"
 
   s.platform              = Gem::Platform::RUBY
   s.required_ruby_version = '>=1.9.0'

data/samples/ios/hello/hello/main.cpp

@@ -39,7 +39,7 @@ class App : public Application
 			win->set_frame(100, 100, 500, 500);
 			win->show();
 
-			win->root()->set_gravity(0, 9.8);
+			win->root()->set_gravity(0, 9.8 * win->root()->meter2pixel());
 
 			Image image(32, 32);
 			Painter painter = image.painter();

data/samples/osx/hello/hello/main.cpp

@@ -39,7 +39,7 @@ class App : public Application
 			win->set_frame(100, 100, 500, 500);
 			win->show();
 
-			win->root()->set_gravity(0, 9.8);
+			win->root()->set_gravity(0, 9.8 * win->root()->meter2pixel());
 			win->root()->set_debug(true);
 
 			Image image(32, 32);

data/samples/reflexion/breakout.rb

@@ -1,52 +1,44 @@
 # -*- coding: utf-8 -*-
 
 
-%w[xot rays reflex]
+%w[xot beeps rays reflex]
   .map  {|s| File.expand_path "../../../../#{s}/lib", __FILE__}
   .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}
 
 require 'reflexion/include'
 
 
-$garbages = []
+$hit, $bang = [880, 440].map {|n| Sound.new SineWave.new(freq: n), 0.1}
+$garbages   = []
 
-class View
-  def setup (frame: [0, 0, 100, 100], color: :white, type: :static)
+def add_shape (klass: RectShape, frame: [0, 0, 100, 100], color: :white, type: :static)
+  window.add klass.new {
     set frame: frame, fill: color, density: 1, friction: 0, restitution: 1, type => true
-  end
+  }
 end
 
 setup do
-  set size: [600, 400]
-  wall.set friction: 0
+  set size: [600, 400], friction: 0
   5.times do |y|
     10.times do |x|
-      add RectShape.new {
-        setup frame: [(x + 1) * 50, (y + 1) * 20, 30, 10], color: [:white, :red, :green, :blue, :yellow][y]
-        on(:contact) {$garbages << self}
-      }
+      shape = add_shape frame: [(x + 1) * 50, (y + 1) * 20, 30, 10], color: [:white, :red, :green, :blue, :yellow][y]
+      shape.on(:contact) {$hit.play; $garbages << shape}
     end
   end
-  $bar = add RectShape.new {
-    setup frame: [0, 350, 100, 20], color: :blue
-  }
-end
-
-update do
-  $garbages.uniq.each {|o| o.parent.remove o}
-  $garbages.clear
-end
-
-draw do
-  text "#{event.fps.to_i} FPS", 10, 10
+  $bar   = add_shape frame: [0, 350, 100, 20], color: :blue
+  bottom = add_shape frame: [0, window.h - 1, window.w, 1]
+  bottom.on(:contact) {|e| $bang.play; $garbages << e.view}
 end
 
 pointer do |e|
   $bar.x = e.x - $bar.w / 2
   if e.down?
-    window.add [EllipseShape, RectShape].sample.new {
-      setup frame: [e.x, $bar.y - 20, 20, 20], type: :dynamic
-      set :linear_velocity, Point.new(rand(-1.0..1.0), -1).normal * 500
-    }
+    ball = add_shape klass: [EllipseShape, RectShape].sample, frame: [e.x, $bar.y - 20, 20, 20], type: :dynamic 
+    ball.velocity = Point.new(rand(-1.0..1.0), -1).normal * 500
   end
 end
+
+update do
+  $garbages.uniq.each {|o| o.parent.remove o}
+  $garbages.clear
+end

data/src/body.cpp

@@ -11,7 +11,7 @@
 #include <Box2D/Collision/Shapes/b2EdgeShape.h>
 #include <Box2D/Collision/Shapes/b2ChainShape.h>
 #include <Box2D/Collision/Shapes/b2PolygonShape.h>
-#include "xot/util.h"
+#include <xot/util.h>
 #include "reflex/exception.h"
 #include "reflex/painter.h"
 #include "world.h"
@@ -212,7 +212,7 @@ namespace Reflex
 			invalid_state_error(__FILE__, __LINE__);
 
 		b2Fixture* f;
-		while (f = PTR->GetFixtureList())
+		while ((f = PTR->GetFixtureList()))
 			PTR->DestroyFixture(f);
 	}
 

data/src/exception.cpp

@@ -1,7 +1,7 @@
 #include "reflex/exception.h"
 
 
-#include "xot/string.h"
+#include <xot/string.h>
 
 
 namespace Reflex

data/src/ios/application.mm

@@ -3,12 +3,17 @@
 
 
 #include <assert.h>
-#include <crt_externs.h>
 #include "reflex/exception.h"
 #include "application_data.h"
 #import "app_delegate.h"
 
 
+extern "C" {
+	char*** _NSGetArgv ();
+	int*    _NSGetArgc ();
+}
+
+
 namespace Reflex
 {
 
@@ -46,7 +51,7 @@ namespace Reflex
 	Application::start ()
 	{
 		UIApplicationMain(
-			*_NSGetArgc(), *_NSGetArgv(), nil, NSStringFromClass([AppDelegate class]));
+			*_NSGetArgc(), *_NSGetArgv(), nil, NSStringFromClass(AppDelegate.class));
 	}
 
 	void

data/src/ios/application_data.h

@@ -1,7 +1,7 @@
 // -*- c++ -*-
 #pragma once
-#ifndef __REFLEX_IOS_APPLICATION_DATA_H__
-#define __REFLEX_IOS_APPLICATION_DATA_H__
+#ifndef __REFLEX_SRC_IOS_APPLICATION_DATA_H__
+#define __REFLEX_SRC_IOS_APPLICATION_DATA_H__
 
 
 #include <reflex/application.h>

data/src/ios/event.h

@@ -1,7 +1,7 @@
 // -*- c++ -*-
 #pragma once
-#ifndef __REFLEX_IOS_EVENT_H__
-#define __REFLEX_IOS_EVENT_H__
+#ifndef __REFLEX_SRC_IOS_EVENT_H__
+#define __REFLEX_SRC_IOS_EVENT_H__
 
 
 #import <UIKit/UIEvent.h>

data/src/ios/event.mm

@@ -20,7 +20,7 @@ namespace Reflex
 
 
 	NativePointerEvent::NativePointerEvent (NSSet* touches, UIEvent* e, UIView* view, Type type)
-	:	PointerEvent(type, POINTER_TOUCH, (coord) 0, (coord) 0)
+	:	PointerEvent(type, POINTER_TOUCH, (coord) 0, (coord) 0, 0, 1, type == MOVE)
 	{
 		CGPoint p = correct_point(view, [touches anyObject]);
 		x = p.x;

data/src/ios/native_window.h

@@ -22,6 +22,8 @@
 
 	- (void) draw;
 
+	- (void) frameChanged;
+
 	- (void) keyDown: (UIEvent*) event;
 
 	- (void) keyUp: (UIEvent*) event;
@@ -34,6 +36,4 @@
 
 	- (void) touchesMoved: (NSSet*) touches withEvent: (UIEvent*) event;
 
-	+ (CGRect) frameRectForContentRect: (CGRect) contentRect;
-
 @end// NativeWindow

data/src/ios/native_window.mm

@@ -26,7 +26,16 @@ namespace Reflex
 
 static CGRect device_frame ()
 {
-	return [[UIScreen mainScreen] applicationFrame];
+	UIScreen* screen = [UIScreen mainScreen];
+	CGRect rect      = screen.applicationFrame;
+	CGFloat scale    = screen.scale;
+
+	rect.origin.x     = 0;
+	rect.origin.y     = 0;
+	rect.size.width  *= scale;
+	rect.size.height *= scale;
+
+	return rect;
 }
 
 
@@ -38,7 +47,7 @@ static CGRect device_frame ()
 		if (!self) return nil;
 
 		pref            = new Reflex::Window::Ref;
-		view_controller = [[OpenGLViewController alloc] initWithNibName: nil bundle: nil];
+		view_controller = [[OpenGLViewController alloc] init];
 
 		self.rootViewController = view_controller;
 
@@ -229,9 +238,4 @@ static CGRect device_frame ()
 		REF->on_pointer(&e);
 	}
 
-	+ (CGRect) frameRectForContentRect: (CGRect) contentRect
-	{
-		return device_frame();
-	}
-
 @end// NativeWindow

data/src/ios/opengl_view.mm

@@ -26,7 +26,7 @@
 		view.drawableDepthFormat = GLKViewDrawableDepthFormat24;
 		view.drawableMultisample = GLKViewDrawableMultisample4X;
 
-		//self.preferredFramesPerSecond = 60;
+		self.preferredFramesPerSecond = 60;
 
 		[self setupOpenGL];
 	}

data/src/ios/window.mm

@@ -191,7 +191,7 @@ namespace Reflex
 		if (!*this)
 			invalid_state_error(__FILE__, __LINE__);
 
-		self->native.frame = [NativeWindow frameRectForContentRect: CGRectMake(x, y, width, height)];
+		[self->native frameChanged];
 	}
 
 	void

data/src/ios/window_data.h

@@ -1,7 +1,7 @@
 // -*- c++ -*-
 #pragma once
-#ifndef __REFLEX_IOS_WINDOW_DATA_H__
-#define __REFLEX_IOS_WINDOW_DATA_H__
+#ifndef __REFLEX_SRC_IOS_WINDOW_DATA_H__
+#define __REFLEX_SRC_IOS_WINDOW_DATA_H__
 
 
 #include <map>

data/src/osx/application_data.h

@@ -1,7 +1,7 @@
 // -*- c++ -*-
 #pragma once
-#ifndef __REFLEX_OSX_APPLICATION_DATA_H__
-#define __REFLEX_OSX_APPLICATION_DATA_H__
+#ifndef __REFLEX_SRC_OSX_APPLICATION_DATA_H__
+#define __REFLEX_SRC_OSX_APPLICATION_DATA_H__
 
 
 #include <reflex/application.h>

data/src/osx/event.h

@@ -1,7 +1,7 @@
 // -*- c++ -*-
 #pragma once
-#ifndef __REFLEX_OSX_EVENT_H__
-#define __REFLEX_OSX_EVENT_H__
+#ifndef __REFLEX_SRC_OSX_EVENT_H__
+#define __REFLEX_SRC_OSX_EVENT_H__
 
 
 #import <AppKit/NSEvent.h>

data/src/osx/window_data.h

@@ -1,7 +1,7 @@
 // -*- c++ -*-
 #pragma once
-#ifndef __REFLEX_OSX_WINDOW_DATA_H__
-#define __REFLEX_OSX_WINDOW_DATA_H__
+#ifndef __REFLEX_SRC_OSX_WINDOW_DATA_H__
+#define __REFLEX_SRC_OSX_WINDOW_DATA_H__
 
 
 #include <map>

data/src/view.cpp

@@ -4,7 +4,7 @@
 #include <assert.h>
 #include <algorithm>
 #include <boost/scoped_ptr.hpp>
-#include "xot/util.h"
+#include <xot/util.h>
 #include "reflex/window.h"
 #include "reflex/body.h"
 #include "reflex/exception.h"

data/src/win32/defs.h

@@ -1,7 +1,7 @@
 // -*- c++ -*-
 #pragma once
-#ifndef __REFLEX_WIN32_DEFS_H__
-#define __REFLEX_WIN32_DEFS_H__
+#ifndef __REFLEX_SRC_WIN32_DEFS_H__
+#define __REFLEX_SRC_WIN32_DEFS_H__
 
 
 #include <windows.h>

data/src/win32/opengl.h

@@ -1,7 +1,7 @@
 // -*- c++ -*-
 #pragma once
-#ifndef __REFLEX_WIN32_OPENGL_H__
-#define __REFLEX_WIN32_OPENGL_H__
+#ifndef __REFLEX_SRC_WIN32_OPENGL_H__
+#define __REFLEX_SRC_WIN32_OPENGL_H__
 
 
 #include <windows.h>

data/src/world.cpp

@@ -5,7 +5,7 @@
 #include <boost/scoped_array.hpp>
 #include <Box2D/Dynamics/b2Body.h>
 #include <Box2D/Common/b2Draw.h>
-#include "xot/util.h"
+#include <xot/util.h>
 #include "reflex/body.h"
 #include "reflex/view.h"
 #include "reflex/event.h"

data/src/world.h

@@ -1,7 +1,7 @@
 // -*- c++ -*-
 #pragma once
-#ifndef __REFLEX_WORLD_H__
-#define __REFLEX_WORLD_H__
+#ifndef __REFLEX_SRC_WORLD_H__
+#define __REFLEX_SRC_WORLD_H__
 
 
 #include <boost/noncopyable.hpp>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reflexion
 version: !ruby/object:Gem::Version
-  version: 0.1.9.1
+  version: 0.1.10
 platform: ruby
 authors:
 - snori
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-30 00:00:00.000000000 Z
+date: 2015-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -456,7 +456,7 @@ files:
 - ".doc/ext/reflex/view.cpp"
 - ".doc/ext/reflex/wheel_event.cpp"
 - ".doc/ext/reflex/window.cpp"
-homepage: https://github.com/xord/spacy/wiki/Reflex-Home
+homepage: https://github.com/xord/reflex
 licenses: []
 metadata: {}
 post_install_message: