reflexion 0.1.11 → 0.1.16
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -5
- data/.doc/ext/reflex/application.cpp +9 -5
- data/.doc/ext/reflex/capture_event.cpp +4 -9
- data/.doc/ext/reflex/contact_event.cpp +17 -13
- data/.doc/ext/reflex/draw_event.cpp +3 -8
- data/.doc/ext/reflex/ellipse_shape.cpp +51 -24
- data/.doc/ext/reflex/event.cpp +0 -4
- data/.doc/ext/reflex/filter.cpp +81 -0
- data/.doc/ext/reflex/focus_event.cpp +9 -13
- data/.doc/ext/reflex/frame_event.cpp +47 -14
- data/.doc/ext/reflex/image_view.cpp +1 -10
- data/.doc/ext/reflex/key_event.cpp +9 -14
- data/.doc/ext/reflex/line_shape.cpp +99 -0
- data/.doc/ext/reflex/motion_event.cpp +73 -0
- data/.doc/ext/reflex/native.cpp +18 -18
- data/.doc/ext/reflex/pointer_event.cpp +27 -25
- data/.doc/ext/reflex/polygon_shape.cpp +65 -0
- data/.doc/ext/reflex/rect_shape.cpp +102 -23
- data/.doc/ext/reflex/reflex.cpp +24 -3
- data/.doc/ext/reflex/scroll_event.cpp +8 -15
- data/.doc/ext/reflex/selector.cpp +43 -15
- data/.doc/ext/reflex/shape.cpp +211 -0
- data/.doc/ext/reflex/style.cpp +359 -185
- data/.doc/ext/reflex/style_length.cpp +163 -35
- data/.doc/ext/reflex/timer.cpp +101 -0
- data/.doc/ext/reflex/timer_event.cpp +123 -0
- data/.doc/ext/reflex/update_event.cpp +12 -8
- data/.doc/ext/reflex/view.cpp +548 -144
- data/.doc/ext/reflex/wheel_event.cpp +5 -28
- data/.doc/ext/reflex/window.cpp +7 -15
- data/LICENSE +21 -0
- data/README.md +1 -1
- data/Rakefile +14 -12
- data/VERSION +1 -1
- data/ext/reflex/application.cpp +10 -5
- data/ext/reflex/capture_event.cpp +4 -9
- data/ext/reflex/contact_event.cpp +18 -13
- data/ext/reflex/defs.h +5 -2
- data/ext/reflex/draw_event.cpp +3 -8
- data/ext/reflex/ellipse_shape.cpp +56 -25
- data/ext/reflex/event.cpp +0 -4
- data/ext/reflex/extconf.rb +1 -2
- data/ext/reflex/filter.cpp +86 -0
- data/ext/reflex/focus_event.cpp +11 -15
- data/ext/reflex/frame_event.cpp +52 -14
- data/ext/reflex/image_view.cpp +1 -10
- data/ext/reflex/key_event.cpp +9 -14
- data/ext/reflex/line_shape.cpp +104 -0
- data/ext/reflex/motion_event.cpp +77 -0
- data/ext/reflex/native.cpp +18 -18
- data/ext/reflex/pointer_event.cpp +27 -25
- data/ext/reflex/polygon_shape.cpp +68 -0
- data/ext/reflex/rect_shape.cpp +113 -24
- data/ext/reflex/reflex.cpp +24 -3
- data/ext/reflex/scroll_event.cpp +8 -15
- data/ext/reflex/selector.cpp +46 -16
- data/ext/reflex/selector.h +130 -0
- data/ext/reflex/shape.cpp +231 -0
- data/ext/reflex/style.cpp +363 -192
- data/ext/reflex/style_length.cpp +164 -37
- data/ext/reflex/timer.cpp +108 -0
- data/ext/reflex/timer_event.cpp +133 -0
- data/ext/reflex/update_event.cpp +13 -8
- data/ext/reflex/view.cpp +594 -150
- data/ext/reflex/wheel_event.cpp +5 -30
- data/ext/reflex/window.cpp +7 -15
- data/include/reflex.h +5 -4
- data/include/reflex/application.h +2 -0
- data/include/reflex/debug.h +22 -0
- data/include/reflex/defs.h +45 -2
- data/include/reflex/event.h +55 -11
- data/include/reflex/exception.h +17 -2
- data/include/reflex/filter.h +56 -0
- data/include/reflex/image_view.h +1 -1
- data/include/reflex/ruby.h +6 -4
- data/include/reflex/ruby/application.h +17 -9
- data/include/reflex/ruby/event.h +22 -0
- data/include/reflex/ruby/filter.h +69 -0
- data/include/reflex/ruby/reflex.h +1 -0
- data/include/reflex/ruby/selector.h +1 -1
- data/include/reflex/ruby/shape.h +140 -0
- data/include/reflex/ruby/style.h +1 -1
- data/include/reflex/ruby/timer.h +69 -0
- data/include/reflex/ruby/view.h +43 -76
- data/include/reflex/ruby/window.h +17 -32
- data/include/reflex/selector.h +54 -2
- data/include/reflex/shape.h +211 -0
- data/include/reflex/style.h +136 -76
- data/include/reflex/timer.h +73 -0
- data/include/reflex/view.h +181 -59
- data/include/reflex/window.h +4 -3
- data/lib/reflex.rb +13 -6
- data/lib/reflex/application.rb +6 -3
- data/lib/reflex/button.rb +2 -2
- data/lib/reflex/{texture.rb → camera.rb} +2 -2
- data/lib/reflex/capture_event.rb +7 -6
- data/lib/reflex/contact_event.rb +10 -12
- data/lib/reflex/draw_event.rb +6 -1
- data/lib/reflex/ellipse_shape.rb +27 -0
- data/lib/reflex/filter.rb +18 -0
- data/lib/reflex/fixture.rb +4 -0
- data/lib/reflex/focus_event.rb +10 -12
- data/lib/reflex/frame_event.rb +1 -1
- data/lib/reflex/helper.rb +17 -29
- data/lib/reflex/key_event.rb +13 -11
- data/lib/reflex/line_shape.rb +18 -0
- data/lib/reflex/matrix.rb +13 -0
- data/lib/reflex/module.rb +4 -19
- data/lib/reflex/pointer_event.rb +28 -35
- data/lib/reflex/polygon.rb +14 -0
- data/lib/reflex/polygon_shape.rb +23 -0
- data/lib/reflex/polyline.rb +13 -0
- data/lib/reflex/rect_shape.rb +20 -0
- data/lib/reflex/reflex.rb +1 -3
- data/lib/reflex/scroll_event.rb +1 -1
- data/lib/reflex/selector.rb +2 -2
- data/lib/reflex/shape.rb +62 -0
- data/lib/reflex/style.rb +78 -11
- data/lib/reflex/style_length.rb +0 -11
- data/lib/reflex/text_view.rb +7 -24
- data/lib/reflex/timer.rb +30 -0
- data/lib/reflex/timer_event.rb +29 -0
- data/lib/reflex/update_event.rb +1 -1
- data/lib/reflex/view.rb +127 -32
- data/lib/reflex/wheel_event.rb +9 -1
- data/lib/reflex/window.rb +29 -9
- data/lib/reflexion.rb +23 -7
- data/reflex.gemspec +7 -8
- data/samples/bats.rb +4 -4
- data/samples/camera.rb +32 -0
- data/samples/fans.rb +1 -1
- data/samples/fps.rb +5 -3
- data/samples/hello.rb +4 -6
- data/samples/image.rb +5 -4
- data/samples/ios/hello/hello.xcodeproj/project.pbxproj +0 -2
- data/samples/layout.rb +16 -7
- data/samples/model.rb +10 -7
- data/samples/physics.rb +22 -20
- data/samples/reflexion/breakout.rb +4 -5
- data/samples/reflexion/hello.rb +2 -2
- data/samples/reflexion/jump_action.rb +191 -0
- data/samples/reflexion/noise.rb +23 -0
- data/samples/reflexion/paint.rb +7 -6
- data/samples/reflexion/physics.rb +15 -8
- data/samples/reflexion/pulse.rb +24 -10
- data/samples/shader.rb +8 -6
- data/samples/shapes.rb +79 -14
- data/samples/tree.rb +9 -10
- data/samples/views.rb +3 -3
- data/samples/visuals.rb +2 -5
- data/src/body.cpp +146 -345
- data/src/body.h +91 -0
- data/src/event.cpp +65 -15
- data/src/exception.cpp +13 -3
- data/src/filter.cpp +76 -0
- data/src/fixture.cpp +164 -39
- data/src/fixture.h +85 -0
- data/src/image_view.cpp +4 -4
- data/src/ios/app_delegate.h +5 -10
- data/src/ios/app_delegate.mm +79 -41
- data/src/ios/application.h +32 -0
- data/src/ios/application.mm +35 -25
- data/src/ios/event.mm +8 -4
- data/src/ios/reflex.mm +0 -7
- data/src/ios/view_controller.h +37 -0
- data/src/ios/view_controller.mm +424 -0
- data/src/ios/window.h +40 -0
- data/src/ios/window.mm +59 -250
- data/src/osx/app_delegate.h +5 -10
- data/src/osx/app_delegate.mm +52 -55
- data/src/osx/application.h +32 -0
- data/src/osx/application.mm +44 -39
- data/src/osx/native_window.h +0 -15
- data/src/osx/native_window.mm +127 -127
- data/src/osx/opengl_view.h +0 -2
- data/src/osx/opengl_view.mm +12 -3
- data/src/osx/reflex.mm +0 -9
- data/src/osx/window.h +42 -0
- data/src/osx/window.mm +45 -252
- data/src/selector.cpp +232 -7
- data/src/selector.h +52 -0
- data/src/shape.cpp +1191 -0
- data/src/shape.h +61 -0
- data/src/style.cpp +573 -376
- data/src/style.h +39 -0
- data/src/timer.cpp +288 -0
- data/src/timer.h +55 -0
- data/src/view.cpp +1624 -984
- data/src/view.h +56 -0
- data/src/win32/window.cpp +3 -4
- data/src/window.cpp +302 -20
- data/src/window.h +94 -0
- data/src/world.cpp +112 -111
- data/src/world.h +34 -53
- data/task/box2d.rake +31 -10
- data/test/test_capture_event.rb +8 -6
- data/test/test_pointer_event.rb +130 -0
- data/test/test_selector.rb +1 -1
- data/test/test_shape.rb +71 -0
- data/test/test_style.rb +77 -11
- data/test/test_style_length.rb +42 -13
- data/test/test_view.rb +138 -14
- metadata +118 -202
- data/.doc/ext/reflex/arc_shape.cpp +0 -89
- data/.doc/ext/reflex/body.cpp +0 -299
- data/.doc/ext/reflex/fixture.cpp +0 -101
- data/.doc/ext/reflex/shape_view.cpp +0 -153
- data/ext/reflex/arc_shape.cpp +0 -94
- data/ext/reflex/body.cpp +0 -328
- data/ext/reflex/fixture.cpp +0 -108
- data/ext/reflex/shape_view.cpp +0 -161
- data/include/reflex/bitmap.h +0 -20
- data/include/reflex/body.h +0 -128
- data/include/reflex/bounds.h +0 -20
- data/include/reflex/color.h +0 -20
- data/include/reflex/color_space.h +0 -20
- data/include/reflex/fixture.h +0 -117
- data/include/reflex/font.h +0 -20
- data/include/reflex/image.h +0 -20
- data/include/reflex/matrix.h +0 -20
- data/include/reflex/painter.h +0 -20
- data/include/reflex/point.h +0 -24
- data/include/reflex/ruby/body.h +0 -41
- data/include/reflex/ruby/fixture.h +0 -41
- data/include/reflex/ruby/shape_view.h +0 -96
- data/include/reflex/shader.h +0 -20
- data/include/reflex/shape_view.h +0 -146
- data/include/reflex/texture.h +0 -20
- data/lib/reflex/body.rb +0 -22
- data/lib/reflex/flags.rb +0 -18
- data/lib/reflex/shape_view.rb +0 -25
- data/src/ios/application_data.h +0 -45
- data/src/ios/native_window.h +0 -39
- data/src/ios/native_window.mm +0 -224
- data/src/ios/opengl_view.h +0 -13
- data/src/ios/opengl_view.mm +0 -139
- data/src/ios/window_data.h +0 -75
- data/src/osx/application_data.h +0 -45
- data/src/osx/window_data.h +0 -75
- data/src/physics/Box2D/Box2D.h +0 -68
- data/src/physics/Box2D/Collision/Shapes/b2ChainShape.cpp +0 -193
- data/src/physics/Box2D/Collision/Shapes/b2ChainShape.h +0 -105
- data/src/physics/Box2D/Collision/Shapes/b2CircleShape.cpp +0 -99
- data/src/physics/Box2D/Collision/Shapes/b2CircleShape.h +0 -91
- data/src/physics/Box2D/Collision/Shapes/b2EdgeShape.cpp +0 -138
- data/src/physics/Box2D/Collision/Shapes/b2EdgeShape.h +0 -74
- data/src/physics/Box2D/Collision/Shapes/b2PolygonShape.cpp +0 -467
- data/src/physics/Box2D/Collision/Shapes/b2PolygonShape.h +0 -101
- data/src/physics/Box2D/Collision/Shapes/b2Shape.h +0 -101
- data/src/physics/Box2D/Collision/b2BroadPhase.cpp +0 -119
- data/src/physics/Box2D/Collision/b2BroadPhase.h +0 -257
- data/src/physics/Box2D/Collision/b2CollideCircle.cpp +0 -154
- data/src/physics/Box2D/Collision/b2CollideEdge.cpp +0 -698
- data/src/physics/Box2D/Collision/b2CollidePolygon.cpp +0 -239
- data/src/physics/Box2D/Collision/b2Collision.cpp +0 -252
- data/src/physics/Box2D/Collision/b2Collision.h +0 -277
- data/src/physics/Box2D/Collision/b2Distance.cpp +0 -603
- data/src/physics/Box2D/Collision/b2Distance.h +0 -141
- data/src/physics/Box2D/Collision/b2DynamicTree.cpp +0 -778
- data/src/physics/Box2D/Collision/b2DynamicTree.h +0 -289
- data/src/physics/Box2D/Collision/b2TimeOfImpact.cpp +0 -486
- data/src/physics/Box2D/Collision/b2TimeOfImpact.h +0 -58
- data/src/physics/Box2D/Common/b2BlockAllocator.cpp +0 -215
- data/src/physics/Box2D/Common/b2BlockAllocator.h +0 -62
- data/src/physics/Box2D/Common/b2Draw.cpp +0 -44
- data/src/physics/Box2D/Common/b2Draw.h +0 -86
- data/src/physics/Box2D/Common/b2GrowableStack.h +0 -85
- data/src/physics/Box2D/Common/b2Math.cpp +0 -94
- data/src/physics/Box2D/Common/b2Math.h +0 -720
- data/src/physics/Box2D/Common/b2Settings.cpp +0 -44
- data/src/physics/Box2D/Common/b2Settings.h +0 -151
- data/src/physics/Box2D/Common/b2StackAllocator.cpp +0 -83
- data/src/physics/Box2D/Common/b2StackAllocator.h +0 -60
- data/src/physics/Box2D/Common/b2Timer.cpp +0 -101
- data/src/physics/Box2D/Common/b2Timer.h +0 -50
- data/src/physics/Box2D/Dynamics/Contacts/b2ChainAndCircleContact.cpp +0 -53
- data/src/physics/Box2D/Dynamics/Contacts/b2ChainAndCircleContact.h +0 -39
- data/src/physics/Box2D/Dynamics/Contacts/b2ChainAndPolygonContact.cpp +0 -53
- data/src/physics/Box2D/Dynamics/Contacts/b2ChainAndPolygonContact.h +0 -39
- data/src/physics/Box2D/Dynamics/Contacts/b2CircleContact.cpp +0 -52
- data/src/physics/Box2D/Dynamics/Contacts/b2CircleContact.h +0 -39
- data/src/physics/Box2D/Dynamics/Contacts/b2Contact.cpp +0 -247
- data/src/physics/Box2D/Dynamics/Contacts/b2Contact.h +0 -349
- data/src/physics/Box2D/Dynamics/Contacts/b2ContactSolver.cpp +0 -838
- data/src/physics/Box2D/Dynamics/Contacts/b2ContactSolver.h +0 -95
- data/src/physics/Box2D/Dynamics/Contacts/b2EdgeAndCircleContact.cpp +0 -49
- data/src/physics/Box2D/Dynamics/Contacts/b2EdgeAndCircleContact.h +0 -39
- data/src/physics/Box2D/Dynamics/Contacts/b2EdgeAndPolygonContact.cpp +0 -49
- data/src/physics/Box2D/Dynamics/Contacts/b2EdgeAndPolygonContact.h +0 -39
- data/src/physics/Box2D/Dynamics/Contacts/b2PolygonAndCircleContact.cpp +0 -49
- data/src/physics/Box2D/Dynamics/Contacts/b2PolygonAndCircleContact.h +0 -38
- data/src/physics/Box2D/Dynamics/Contacts/b2PolygonContact.cpp +0 -52
- data/src/physics/Box2D/Dynamics/Contacts/b2PolygonContact.h +0 -39
- data/src/physics/Box2D/Dynamics/Joints/b2DistanceJoint.cpp +0 -260
- data/src/physics/Box2D/Dynamics/Joints/b2DistanceJoint.h +0 -169
- data/src/physics/Box2D/Dynamics/Joints/b2FrictionJoint.cpp +0 -251
- data/src/physics/Box2D/Dynamics/Joints/b2FrictionJoint.h +0 -119
- data/src/physics/Box2D/Dynamics/Joints/b2GearJoint.cpp +0 -419
- data/src/physics/Box2D/Dynamics/Joints/b2GearJoint.h +0 -125
- data/src/physics/Box2D/Dynamics/Joints/b2Joint.cpp +0 -211
- data/src/physics/Box2D/Dynamics/Joints/b2Joint.h +0 -226
- data/src/physics/Box2D/Dynamics/Joints/b2MotorJoint.cpp +0 -304
- data/src/physics/Box2D/Dynamics/Joints/b2MotorJoint.h +0 -133
- data/src/physics/Box2D/Dynamics/Joints/b2MouseJoint.cpp +0 -222
- data/src/physics/Box2D/Dynamics/Joints/b2MouseJoint.h +0 -129
- data/src/physics/Box2D/Dynamics/Joints/b2PrismaticJoint.cpp +0 -629
- data/src/physics/Box2D/Dynamics/Joints/b2PrismaticJoint.h +0 -196
- data/src/physics/Box2D/Dynamics/Joints/b2PulleyJoint.cpp +0 -348
- data/src/physics/Box2D/Dynamics/Joints/b2PulleyJoint.h +0 -152
- data/src/physics/Box2D/Dynamics/Joints/b2RevoluteJoint.cpp +0 -502
- data/src/physics/Box2D/Dynamics/Joints/b2RevoluteJoint.h +0 -204
- data/src/physics/Box2D/Dynamics/Joints/b2RopeJoint.cpp +0 -241
- data/src/physics/Box2D/Dynamics/Joints/b2RopeJoint.h +0 -114
- data/src/physics/Box2D/Dynamics/Joints/b2WeldJoint.cpp +0 -344
- data/src/physics/Box2D/Dynamics/Joints/b2WeldJoint.h +0 -126
- data/src/physics/Box2D/Dynamics/Joints/b2WheelJoint.cpp +0 -419
- data/src/physics/Box2D/Dynamics/Joints/b2WheelJoint.h +0 -210
- data/src/physics/Box2D/Dynamics/b2Body.cpp +0 -549
- data/src/physics/Box2D/Dynamics/b2Body.h +0 -860
- data/src/physics/Box2D/Dynamics/b2ContactManager.cpp +0 -296
- data/src/physics/Box2D/Dynamics/b2ContactManager.h +0 -52
- data/src/physics/Box2D/Dynamics/b2Fixture.cpp +0 -303
- data/src/physics/Box2D/Dynamics/b2Fixture.h +0 -345
- data/src/physics/Box2D/Dynamics/b2Island.cpp +0 -539
- data/src/physics/Box2D/Dynamics/b2Island.h +0 -93
- data/src/physics/Box2D/Dynamics/b2TimeStep.h +0 -70
- data/src/physics/Box2D/Dynamics/b2World.cpp +0 -1339
- data/src/physics/Box2D/Dynamics/b2World.h +0 -354
- data/src/physics/Box2D/Dynamics/b2WorldCallbacks.cpp +0 -36
- data/src/physics/Box2D/Dynamics/b2WorldCallbacks.h +0 -155
- data/src/physics/Box2D/Rope/b2Rope.cpp +0 -259
- data/src/physics/Box2D/Rope/b2Rope.h +0 -115
- data/src/shape_view.cpp +0 -306
data/src/fixture.h
ADDED
@@ -0,0 +1,85 @@
|
|
1
|
+
// -*- c++ -*-
|
2
|
+
#pragma once
|
3
|
+
#ifndef __REFLEX_SRC_FIXTURE_H__
|
4
|
+
#define __REFLEX_SRC_FIXTURE_H__
|
5
|
+
|
6
|
+
|
7
|
+
#include <memory>
|
8
|
+
#include <xot/noncopyable.h>
|
9
|
+
#include <reflex/defs.h>
|
10
|
+
|
11
|
+
|
12
|
+
class b2Fixture;
|
13
|
+
class b2Shape;
|
14
|
+
|
15
|
+
|
16
|
+
namespace Reflex
|
17
|
+
{
|
18
|
+
|
19
|
+
|
20
|
+
class Body;
|
21
|
+
|
22
|
+
|
23
|
+
class Fixture : public Xot::NonCopyable
|
24
|
+
{
|
25
|
+
|
26
|
+
public:
|
27
|
+
|
28
|
+
Fixture (Body* body, const b2Shape* b2shape, void* userdata = NULL);
|
29
|
+
|
30
|
+
~Fixture ();
|
31
|
+
|
32
|
+
void set_density (float density);
|
33
|
+
|
34
|
+
float density () const;
|
35
|
+
|
36
|
+
void set_friction (float friction);
|
37
|
+
|
38
|
+
float friction () const;
|
39
|
+
|
40
|
+
void set_restitution (float restitution);
|
41
|
+
|
42
|
+
float restitution () const;
|
43
|
+
|
44
|
+
void set_sensor (bool state);
|
45
|
+
|
46
|
+
bool is_sensor () const;
|
47
|
+
|
48
|
+
void set_category_bits (uint bits);
|
49
|
+
|
50
|
+
uint category_bits () const;
|
51
|
+
|
52
|
+
void set_collision_mask (uint mask);
|
53
|
+
|
54
|
+
uint collision_mask () const;
|
55
|
+
|
56
|
+
b2Fixture* b2ptr ();
|
57
|
+
|
58
|
+
const b2Fixture* b2ptr () const;
|
59
|
+
|
60
|
+
void set_next (Fixture* fixture);
|
61
|
+
|
62
|
+
Fixture* next ();
|
63
|
+
|
64
|
+
const Fixture* next () const;
|
65
|
+
|
66
|
+
private:
|
67
|
+
|
68
|
+
b2Fixture* b2fixture;
|
69
|
+
|
70
|
+
std::unique_ptr<Fixture> pnext;
|
71
|
+
|
72
|
+
};// Fixture
|
73
|
+
|
74
|
+
|
75
|
+
void Fixture_copy_attributes (Fixture* to, const Fixture& from);
|
76
|
+
|
77
|
+
Fixture* Fixture_create_temporary ();
|
78
|
+
|
79
|
+
bool Fixture_is_temporary (const Fixture& fixture);
|
80
|
+
|
81
|
+
|
82
|
+
}// Reflex
|
83
|
+
|
84
|
+
|
85
|
+
#endif//EOH
|
data/src/image_view.cpp
CHANGED
@@ -39,13 +39,13 @@ namespace Reflex
|
|
39
39
|
return self->image;
|
40
40
|
}
|
41
41
|
|
42
|
-
|
43
|
-
ImageView::
|
42
|
+
Bounds
|
43
|
+
ImageView::content_bounds () const
|
44
44
|
{
|
45
45
|
if (self->image)
|
46
|
-
return
|
46
|
+
return Bounds(self->image.width(), self->image.height());
|
47
47
|
else
|
48
|
-
return Super::
|
48
|
+
return Super::content_bounds();
|
49
49
|
}
|
50
50
|
|
51
51
|
void
|
data/src/ios/app_delegate.h
CHANGED
@@ -1,17 +1,12 @@
|
|
1
1
|
// -*- objc -*-
|
2
2
|
#import <UIKit/UIApplication.h>
|
3
|
-
#include
|
3
|
+
#include "application.h"
|
4
4
|
|
5
5
|
|
6
|
-
@interface
|
6
|
+
@interface ReflexAppDelegate : UIResponder <UIApplicationDelegate>
|
7
7
|
|
8
|
-
|
9
|
-
@private
|
10
|
-
Reflex::Application::Ref* pref;
|
11
|
-
}
|
8
|
+
- (void) bind: (Reflex::Application*) application;
|
12
9
|
|
13
|
-
- (
|
10
|
+
- (BOOL) callOnStart;
|
14
11
|
|
15
|
-
|
16
|
-
|
17
|
-
@end// AppDelegate
|
12
|
+
@end// ReflexAppDelegate
|
data/src/ios/app_delegate.mm
CHANGED
@@ -3,86 +3,124 @@
|
|
3
3
|
|
4
4
|
|
5
5
|
#include <assert.h>
|
6
|
+
#import <CoreMotion/CoreMotion.h>
|
6
7
|
#include "reflex/event.h"
|
7
8
|
#include "reflex/exception.h"
|
8
|
-
#include "application_data.h"
|
9
9
|
|
10
10
|
|
11
|
-
|
11
|
+
@implementation ReflexAppDelegate
|
12
12
|
|
13
|
-
|
14
|
-
|
13
|
+
{
|
14
|
+
Reflex::Application* application;
|
15
|
+
bool started;
|
16
|
+
UIWindow* window;
|
17
|
+
CMMotionManager* motion_manager;
|
18
|
+
}
|
15
19
|
|
16
20
|
- (id) init
|
17
21
|
{
|
18
22
|
self = [super init];
|
19
23
|
if (!self) return nil;
|
20
24
|
|
21
|
-
|
25
|
+
application = NULL;
|
26
|
+
started = false;
|
27
|
+
window = nil;
|
28
|
+
motion_manager = nil;
|
22
29
|
|
23
30
|
return self;
|
24
31
|
}
|
25
32
|
|
26
33
|
- (void) dealloc
|
27
34
|
{
|
28
|
-
assert(
|
35
|
+
assert(!application);
|
29
36
|
|
30
|
-
|
37
|
+
[self stopUpdateDeviceMotion];
|
31
38
|
|
32
39
|
[super dealloc];
|
33
40
|
}
|
34
41
|
|
35
|
-
- (void) bind: (Reflex::Application*)
|
42
|
+
- (void) bind: (Reflex::Application*) app
|
36
43
|
{
|
37
|
-
|
38
|
-
|
39
|
-
if (instance && instance->self->delegate)
|
44
|
+
if (!app)
|
40
45
|
Reflex::argument_error(__FILE__, __LINE__);
|
41
46
|
|
42
|
-
if (
|
47
|
+
if (app->self->delegate)
|
43
48
|
Reflex::invalid_state_error(__FILE__, __LINE__);
|
44
49
|
|
45
|
-
|
46
|
-
|
50
|
+
app->self->delegate = [self retain];
|
51
|
+
app->retain();
|
52
|
+
|
53
|
+
application = app;
|
47
54
|
}
|
48
55
|
|
49
|
-
- (void) unbind
|
56
|
+
- (void) unbind
|
50
57
|
{
|
51
|
-
|
58
|
+
if (!application) return;
|
52
59
|
|
53
|
-
if (
|
60
|
+
if (application->self->delegate)
|
61
|
+
{
|
62
|
+
[application->self->delegate release];
|
63
|
+
application->self->delegate = nil;
|
64
|
+
}
|
54
65
|
|
55
|
-
|
56
|
-
|
66
|
+
application->release();
|
67
|
+
application = NULL;
|
68
|
+
}
|
69
|
+
|
70
|
+
- (BOOL) callOnStart
|
71
|
+
{
|
72
|
+
if (!application || started)
|
73
|
+
return YES;
|
74
|
+
|
75
|
+
Reflex::Event e;
|
76
|
+
application->on_start(&e);
|
77
|
+
started = true;
|
57
78
|
|
58
|
-
|
59
|
-
REF->self->delegate = nil;
|
60
|
-
REF.reset();
|
79
|
+
return !e.is_blocked();
|
61
80
|
}
|
62
81
|
|
63
82
|
- (BOOL) application: (UIApplication*) application
|
64
83
|
didFinishLaunchingWithOptions: (NSDictionary*) options
|
65
84
|
{
|
66
|
-
|
67
|
-
|
68
|
-
|
69
|
-
__FILE__, __LINE__,
|
70
|
-
"no Application instance on application:didFinishLaunchingWithOptions:");
|
71
|
-
}
|
85
|
+
Reflex::Application* app = Reflex::app();
|
86
|
+
if (!self->application && app)
|
87
|
+
[self bind: app];
|
72
88
|
|
73
|
-
[self
|
89
|
+
[self startUpdateDeviceMotion];
|
74
90
|
|
75
|
-
|
76
|
-
|
77
|
-
|
78
|
-
|
79
|
-
|
91
|
+
return [self callOnStart];
|
92
|
+
}
|
93
|
+
|
94
|
+
- (void) startUpdateDeviceMotion
|
95
|
+
{
|
96
|
+
CMMotionManager* man = [[[CMMotionManager alloc] init] autorelease];
|
97
|
+
if (!man || !man.deviceMotionAvailable)
|
98
|
+
return;
|
99
|
+
|
100
|
+
man.deviceMotionUpdateInterval = 1 / 60.0;
|
101
|
+
[man
|
102
|
+
startDeviceMotionUpdatesToQueue: NSOperationQueue.currentQueue
|
103
|
+
withHandler: ^(CMDeviceMotion* motion, NSError* error)
|
80
104
|
{
|
81
|
-
return
|
105
|
+
if (!application) return;
|
106
|
+
|
107
|
+
Reflex::MotionEvent e(
|
108
|
+
Reflex::Point(motion.gravity.x, -motion.gravity.y, motion.gravity.z));
|
109
|
+
application->on_motion(&e);
|
82
110
|
}
|
83
|
-
|
111
|
+
];
|
112
|
+
|
113
|
+
motion_manager = [man retain];
|
114
|
+
}
|
115
|
+
|
116
|
+
- (void) stopUpdateDeviceMotion
|
117
|
+
{
|
118
|
+
if (!motion_manager || !motion_manager.deviceMotionActive)
|
119
|
+
return;
|
84
120
|
|
85
|
-
|
121
|
+
[motion_manager stopDeviceMotionUpdates];
|
122
|
+
[motion_manager release];
|
123
|
+
motion_manager = nil;
|
86
124
|
}
|
87
125
|
|
88
126
|
- (void) applicationWillResignActive: (UIApplication*) application
|
@@ -103,10 +141,10 @@
|
|
103
141
|
|
104
142
|
- (void) applicationWillTerminate: (UIApplication*) application
|
105
143
|
{
|
106
|
-
if (
|
144
|
+
if (self->application)
|
107
145
|
{
|
108
146
|
Reflex::Event e;
|
109
|
-
|
147
|
+
self->application->on_quit(&e);
|
110
148
|
if (e.is_blocked())
|
111
149
|
{
|
112
150
|
Reflex::not_implemented_error(
|
@@ -114,7 +152,7 @@
|
|
114
152
|
}
|
115
153
|
}
|
116
154
|
|
117
|
-
[self unbind
|
155
|
+
[self unbind];
|
118
156
|
}
|
119
157
|
|
120
|
-
@end//
|
158
|
+
@end// ReflexAppDelegate
|
@@ -0,0 +1,32 @@
|
|
1
|
+
// -*- c++ -*-
|
2
|
+
#pragma once
|
3
|
+
#ifndef __REFLEX_SRC_IOS_APPLICATION_H__
|
4
|
+
#define __REFLEX_SRC_IOS_APPLICATION_H__
|
5
|
+
|
6
|
+
|
7
|
+
#include <reflex/application.h>
|
8
|
+
|
9
|
+
|
10
|
+
@class ReflexAppDelegate;
|
11
|
+
|
12
|
+
|
13
|
+
namespace Reflex
|
14
|
+
{
|
15
|
+
|
16
|
+
|
17
|
+
struct Application::Data
|
18
|
+
{
|
19
|
+
|
20
|
+
ReflexAppDelegate* delegate;
|
21
|
+
|
22
|
+
String name;
|
23
|
+
|
24
|
+
Data ();
|
25
|
+
|
26
|
+
};// Application::Data
|
27
|
+
|
28
|
+
|
29
|
+
}// Reflex
|
30
|
+
|
31
|
+
|
32
|
+
#endif//EOH
|
data/src/ios/application.mm
CHANGED
@@ -1,10 +1,9 @@
|
|
1
1
|
// -*- objc -*-
|
2
|
-
#include "
|
2
|
+
#include "application.h"
|
3
3
|
|
4
4
|
|
5
5
|
#include <assert.h>
|
6
6
|
#include "reflex/exception.h"
|
7
|
-
#include "application_data.h"
|
8
7
|
#import "app_delegate.h"
|
9
8
|
|
10
9
|
|
@@ -18,48 +17,56 @@ namespace Reflex
|
|
18
17
|
{
|
19
18
|
|
20
19
|
|
21
|
-
|
20
|
+
namespace global
|
21
|
+
{
|
22
22
|
|
23
|
+
static Application* instance = NULL;
|
23
24
|
|
24
|
-
|
25
|
+
}// global
|
25
26
|
|
26
27
|
|
27
28
|
Application*
|
28
29
|
app ()
|
29
30
|
{
|
30
|
-
return instance;
|
31
|
+
return global::instance;
|
31
32
|
}
|
32
33
|
|
33
34
|
|
34
35
|
Application::Application ()
|
35
36
|
{
|
36
|
-
if (
|
37
|
-
reflex_error(__FILE__, __LINE__, "not initialized.");
|
38
|
-
|
39
|
-
if (instance)
|
37
|
+
if (global::instance)
|
40
38
|
reflex_error(__FILE__, __LINE__, "multiple application instances.");
|
41
39
|
|
42
|
-
instance = this;
|
40
|
+
global::instance = this;
|
43
41
|
}
|
44
42
|
|
45
43
|
Application::~Application ()
|
46
44
|
{
|
47
|
-
instance = NULL;
|
45
|
+
global::instance = NULL;
|
48
46
|
}
|
49
47
|
|
50
48
|
void
|
51
49
|
Application::start ()
|
52
50
|
{
|
53
|
-
|
54
|
-
|
51
|
+
UIApplication* app = UIApplication.sharedApplication;
|
52
|
+
id<UIApplicationDelegate> delegate = app.delegate;
|
53
|
+
if (!delegate)
|
54
|
+
{
|
55
|
+
UIApplicationMain(*_NSGetArgc(), *_NSGetArgv(), nil, @"ReflexAppDelegate");
|
56
|
+
return;
|
57
|
+
}
|
58
|
+
|
59
|
+
if ([delegate isKindOfClass: ReflexAppDelegate.class])
|
60
|
+
{
|
61
|
+
ReflexAppDelegate* reflex_delegate = (ReflexAppDelegate*) delegate;
|
62
|
+
[reflex_delegate bind: this];
|
63
|
+
[reflex_delegate callOnStart];
|
64
|
+
}
|
55
65
|
}
|
56
66
|
|
57
67
|
void
|
58
68
|
Application::quit ()
|
59
69
|
{
|
60
|
-
if (!*this)
|
61
|
-
invalid_state_error(__FILE__, __LINE__);
|
62
|
-
|
63
70
|
not_implemented_error(__FILE__, __LINE__);
|
64
71
|
}
|
65
72
|
|
@@ -81,34 +88,31 @@ namespace Reflex
|
|
81
88
|
void
|
82
89
|
Application::on_start (Event* e)
|
83
90
|
{
|
84
|
-
if (!*this)
|
85
|
-
invalid_state_error(__FILE__, __LINE__);
|
86
91
|
}
|
87
92
|
|
88
93
|
void
|
89
94
|
Application::on_quit (Event* e)
|
90
95
|
{
|
91
|
-
|
92
|
-
|
96
|
+
}
|
97
|
+
|
98
|
+
void
|
99
|
+
Application::on_motion (MotionEvent* e)
|
100
|
+
{
|
93
101
|
}
|
94
102
|
|
95
103
|
void
|
96
104
|
Application::on_preference (Event* e)
|
97
105
|
{
|
98
|
-
if (!*this)
|
99
|
-
invalid_state_error(__FILE__, __LINE__);
|
100
106
|
}
|
101
107
|
|
102
108
|
void
|
103
109
|
Application::on_about (Event* e)
|
104
110
|
{
|
105
|
-
if (!*this)
|
106
|
-
invalid_state_error(__FILE__, __LINE__);
|
107
111
|
}
|
108
112
|
|
109
113
|
Application::operator bool () const
|
110
114
|
{
|
111
|
-
return
|
115
|
+
return true;
|
112
116
|
}
|
113
117
|
|
114
118
|
bool
|
@@ -118,4 +122,10 @@ namespace Reflex
|
|
118
122
|
}
|
119
123
|
|
120
124
|
|
125
|
+
Application::Data::Data ()
|
126
|
+
: delegate(nil)
|
127
|
+
{
|
128
|
+
}
|
129
|
+
|
130
|
+
|
121
131
|
}// Reflex
|