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
@@ -1,204 +0,0 @@
|
|
1
|
-
/*
|
2
|
-
* Copyright (c) 2006-2011 Erin Catto http://www.box2d.org
|
3
|
-
*
|
4
|
-
* This software is provided 'as-is', without any express or implied
|
5
|
-
* warranty. In no event will the authors be held liable for any damages
|
6
|
-
* arising from the use of this software.
|
7
|
-
* Permission is granted to anyone to use this software for any purpose,
|
8
|
-
* including commercial applications, and to alter it and redistribute it
|
9
|
-
* freely, subject to the following restrictions:
|
10
|
-
* 1. The origin of this software must not be misrepresented; you must not
|
11
|
-
* claim that you wrote the original software. If you use this software
|
12
|
-
* in a product, an acknowledgment in the product documentation would be
|
13
|
-
* appreciated but is not required.
|
14
|
-
* 2. Altered source versions must be plainly marked as such, and must not be
|
15
|
-
* misrepresented as being the original software.
|
16
|
-
* 3. This notice may not be removed or altered from any source distribution.
|
17
|
-
*/
|
18
|
-
|
19
|
-
#ifndef B2_REVOLUTE_JOINT_H
|
20
|
-
#define B2_REVOLUTE_JOINT_H
|
21
|
-
|
22
|
-
#include <Box2D/Dynamics/Joints/b2Joint.h>
|
23
|
-
|
24
|
-
/// Revolute joint definition. This requires defining an
|
25
|
-
/// anchor point where the bodies are joined. The definition
|
26
|
-
/// uses local anchor points so that the initial configuration
|
27
|
-
/// can violate the constraint slightly. You also need to
|
28
|
-
/// specify the initial relative angle for joint limits. This
|
29
|
-
/// helps when saving and loading a game.
|
30
|
-
/// The local anchor points are measured from the body's origin
|
31
|
-
/// rather than the center of mass because:
|
32
|
-
/// 1. you might not know where the center of mass will be.
|
33
|
-
/// 2. if you add/remove shapes from a body and recompute the mass,
|
34
|
-
/// the joints will be broken.
|
35
|
-
struct b2RevoluteJointDef : public b2JointDef
|
36
|
-
{
|
37
|
-
b2RevoluteJointDef()
|
38
|
-
{
|
39
|
-
type = e_revoluteJoint;
|
40
|
-
localAnchorA.Set(0.0f, 0.0f);
|
41
|
-
localAnchorB.Set(0.0f, 0.0f);
|
42
|
-
referenceAngle = 0.0f;
|
43
|
-
lowerAngle = 0.0f;
|
44
|
-
upperAngle = 0.0f;
|
45
|
-
maxMotorTorque = 0.0f;
|
46
|
-
motorSpeed = 0.0f;
|
47
|
-
enableLimit = false;
|
48
|
-
enableMotor = false;
|
49
|
-
}
|
50
|
-
|
51
|
-
/// Initialize the bodies, anchors, and reference angle using a world
|
52
|
-
/// anchor point.
|
53
|
-
void Initialize(b2Body* bodyA, b2Body* bodyB, const b2Vec2& anchor);
|
54
|
-
|
55
|
-
/// The local anchor point relative to bodyA's origin.
|
56
|
-
b2Vec2 localAnchorA;
|
57
|
-
|
58
|
-
/// The local anchor point relative to bodyB's origin.
|
59
|
-
b2Vec2 localAnchorB;
|
60
|
-
|
61
|
-
/// The bodyB angle minus bodyA angle in the reference state (radians).
|
62
|
-
float32 referenceAngle;
|
63
|
-
|
64
|
-
/// A flag to enable joint limits.
|
65
|
-
bool enableLimit;
|
66
|
-
|
67
|
-
/// The lower angle for the joint limit (radians).
|
68
|
-
float32 lowerAngle;
|
69
|
-
|
70
|
-
/// The upper angle for the joint limit (radians).
|
71
|
-
float32 upperAngle;
|
72
|
-
|
73
|
-
/// A flag to enable the joint motor.
|
74
|
-
bool enableMotor;
|
75
|
-
|
76
|
-
/// The desired motor speed. Usually in radians per second.
|
77
|
-
float32 motorSpeed;
|
78
|
-
|
79
|
-
/// The maximum motor torque used to achieve the desired motor speed.
|
80
|
-
/// Usually in N-m.
|
81
|
-
float32 maxMotorTorque;
|
82
|
-
};
|
83
|
-
|
84
|
-
/// A revolute joint constrains two bodies to share a common point while they
|
85
|
-
/// are free to rotate about the point. The relative rotation about the shared
|
86
|
-
/// point is the joint angle. You can limit the relative rotation with
|
87
|
-
/// a joint limit that specifies a lower and upper angle. You can use a motor
|
88
|
-
/// to drive the relative rotation about the shared point. A maximum motor torque
|
89
|
-
/// is provided so that infinite forces are not generated.
|
90
|
-
class b2RevoluteJoint : public b2Joint
|
91
|
-
{
|
92
|
-
public:
|
93
|
-
b2Vec2 GetAnchorA() const;
|
94
|
-
b2Vec2 GetAnchorB() const;
|
95
|
-
|
96
|
-
/// The local anchor point relative to bodyA's origin.
|
97
|
-
const b2Vec2& GetLocalAnchorA() const { return m_localAnchorA; }
|
98
|
-
|
99
|
-
/// The local anchor point relative to bodyB's origin.
|
100
|
-
const b2Vec2& GetLocalAnchorB() const { return m_localAnchorB; }
|
101
|
-
|
102
|
-
/// Get the reference angle.
|
103
|
-
float32 GetReferenceAngle() const { return m_referenceAngle; }
|
104
|
-
|
105
|
-
/// Get the current joint angle in radians.
|
106
|
-
float32 GetJointAngle() const;
|
107
|
-
|
108
|
-
/// Get the current joint angle speed in radians per second.
|
109
|
-
float32 GetJointSpeed() const;
|
110
|
-
|
111
|
-
/// Is the joint limit enabled?
|
112
|
-
bool IsLimitEnabled() const;
|
113
|
-
|
114
|
-
/// Enable/disable the joint limit.
|
115
|
-
void EnableLimit(bool flag);
|
116
|
-
|
117
|
-
/// Get the lower joint limit in radians.
|
118
|
-
float32 GetLowerLimit() const;
|
119
|
-
|
120
|
-
/// Get the upper joint limit in radians.
|
121
|
-
float32 GetUpperLimit() const;
|
122
|
-
|
123
|
-
/// Set the joint limits in radians.
|
124
|
-
void SetLimits(float32 lower, float32 upper);
|
125
|
-
|
126
|
-
/// Is the joint motor enabled?
|
127
|
-
bool IsMotorEnabled() const;
|
128
|
-
|
129
|
-
/// Enable/disable the joint motor.
|
130
|
-
void EnableMotor(bool flag);
|
131
|
-
|
132
|
-
/// Set the motor speed in radians per second.
|
133
|
-
void SetMotorSpeed(float32 speed);
|
134
|
-
|
135
|
-
/// Get the motor speed in radians per second.
|
136
|
-
float32 GetMotorSpeed() const;
|
137
|
-
|
138
|
-
/// Set the maximum motor torque, usually in N-m.
|
139
|
-
void SetMaxMotorTorque(float32 torque);
|
140
|
-
float32 GetMaxMotorTorque() const { return m_maxMotorTorque; }
|
141
|
-
|
142
|
-
/// Get the reaction force given the inverse time step.
|
143
|
-
/// Unit is N.
|
144
|
-
b2Vec2 GetReactionForce(float32 inv_dt) const;
|
145
|
-
|
146
|
-
/// Get the reaction torque due to the joint limit given the inverse time step.
|
147
|
-
/// Unit is N*m.
|
148
|
-
float32 GetReactionTorque(float32 inv_dt) const;
|
149
|
-
|
150
|
-
/// Get the current motor torque given the inverse time step.
|
151
|
-
/// Unit is N*m.
|
152
|
-
float32 GetMotorTorque(float32 inv_dt) const;
|
153
|
-
|
154
|
-
/// Dump to b2Log.
|
155
|
-
void Dump();
|
156
|
-
|
157
|
-
protected:
|
158
|
-
|
159
|
-
friend class b2Joint;
|
160
|
-
friend class b2GearJoint;
|
161
|
-
|
162
|
-
b2RevoluteJoint(const b2RevoluteJointDef* def);
|
163
|
-
|
164
|
-
void InitVelocityConstraints(const b2SolverData& data);
|
165
|
-
void SolveVelocityConstraints(const b2SolverData& data);
|
166
|
-
bool SolvePositionConstraints(const b2SolverData& data);
|
167
|
-
|
168
|
-
// Solver shared
|
169
|
-
b2Vec2 m_localAnchorA;
|
170
|
-
b2Vec2 m_localAnchorB;
|
171
|
-
b2Vec3 m_impulse;
|
172
|
-
float32 m_motorImpulse;
|
173
|
-
|
174
|
-
bool m_enableMotor;
|
175
|
-
float32 m_maxMotorTorque;
|
176
|
-
float32 m_motorSpeed;
|
177
|
-
|
178
|
-
bool m_enableLimit;
|
179
|
-
float32 m_referenceAngle;
|
180
|
-
float32 m_lowerAngle;
|
181
|
-
float32 m_upperAngle;
|
182
|
-
|
183
|
-
// Solver temp
|
184
|
-
int32 m_indexA;
|
185
|
-
int32 m_indexB;
|
186
|
-
b2Vec2 m_rA;
|
187
|
-
b2Vec2 m_rB;
|
188
|
-
b2Vec2 m_localCenterA;
|
189
|
-
b2Vec2 m_localCenterB;
|
190
|
-
float32 m_invMassA;
|
191
|
-
float32 m_invMassB;
|
192
|
-
float32 m_invIA;
|
193
|
-
float32 m_invIB;
|
194
|
-
b2Mat33 m_mass; // effective mass for point-to-point constraint.
|
195
|
-
float32 m_motorMass; // effective mass for motor/limit angular constraint.
|
196
|
-
b2LimitState m_limitState;
|
197
|
-
};
|
198
|
-
|
199
|
-
inline float32 b2RevoluteJoint::GetMotorSpeed() const
|
200
|
-
{
|
201
|
-
return m_motorSpeed;
|
202
|
-
}
|
203
|
-
|
204
|
-
#endif
|
@@ -1,241 +0,0 @@
|
|
1
|
-
/*
|
2
|
-
* Copyright (c) 2007-2011 Erin Catto http://www.box2d.org
|
3
|
-
*
|
4
|
-
* This software is provided 'as-is', without any express or implied
|
5
|
-
* warranty. In no event will the authors be held liable for any damages
|
6
|
-
* arising from the use of this software.
|
7
|
-
* Permission is granted to anyone to use this software for any purpose,
|
8
|
-
* including commercial applications, and to alter it and redistribute it
|
9
|
-
* freely, subject to the following restrictions:
|
10
|
-
* 1. The origin of this software must not be misrepresented; you must not
|
11
|
-
* claim that you wrote the original software. If you use this software
|
12
|
-
* in a product, an acknowledgment in the product documentation would be
|
13
|
-
* appreciated but is not required.
|
14
|
-
* 2. Altered source versions must be plainly marked as such, and must not be
|
15
|
-
* misrepresented as being the original software.
|
16
|
-
* 3. This notice may not be removed or altered from any source distribution.
|
17
|
-
*/
|
18
|
-
|
19
|
-
#include <Box2D/Dynamics/Joints/b2RopeJoint.h>
|
20
|
-
#include <Box2D/Dynamics/b2Body.h>
|
21
|
-
#include <Box2D/Dynamics/b2TimeStep.h>
|
22
|
-
|
23
|
-
|
24
|
-
// Limit:
|
25
|
-
// C = norm(pB - pA) - L
|
26
|
-
// u = (pB - pA) / norm(pB - pA)
|
27
|
-
// Cdot = dot(u, vB + cross(wB, rB) - vA - cross(wA, rA))
|
28
|
-
// J = [-u -cross(rA, u) u cross(rB, u)]
|
29
|
-
// K = J * invM * JT
|
30
|
-
// = invMassA + invIA * cross(rA, u)^2 + invMassB + invIB * cross(rB, u)^2
|
31
|
-
|
32
|
-
b2RopeJoint::b2RopeJoint(const b2RopeJointDef* def)
|
33
|
-
: b2Joint(def)
|
34
|
-
{
|
35
|
-
m_localAnchorA = def->localAnchorA;
|
36
|
-
m_localAnchorB = def->localAnchorB;
|
37
|
-
|
38
|
-
m_maxLength = def->maxLength;
|
39
|
-
|
40
|
-
m_mass = 0.0f;
|
41
|
-
m_impulse = 0.0f;
|
42
|
-
m_state = e_inactiveLimit;
|
43
|
-
m_length = 0.0f;
|
44
|
-
}
|
45
|
-
|
46
|
-
void b2RopeJoint::InitVelocityConstraints(const b2SolverData& data)
|
47
|
-
{
|
48
|
-
m_indexA = m_bodyA->m_islandIndex;
|
49
|
-
m_indexB = m_bodyB->m_islandIndex;
|
50
|
-
m_localCenterA = m_bodyA->m_sweep.localCenter;
|
51
|
-
m_localCenterB = m_bodyB->m_sweep.localCenter;
|
52
|
-
m_invMassA = m_bodyA->m_invMass;
|
53
|
-
m_invMassB = m_bodyB->m_invMass;
|
54
|
-
m_invIA = m_bodyA->m_invI;
|
55
|
-
m_invIB = m_bodyB->m_invI;
|
56
|
-
|
57
|
-
b2Vec2 cA = data.positions[m_indexA].c;
|
58
|
-
float32 aA = data.positions[m_indexA].a;
|
59
|
-
b2Vec2 vA = data.velocities[m_indexA].v;
|
60
|
-
float32 wA = data.velocities[m_indexA].w;
|
61
|
-
|
62
|
-
b2Vec2 cB = data.positions[m_indexB].c;
|
63
|
-
float32 aB = data.positions[m_indexB].a;
|
64
|
-
b2Vec2 vB = data.velocities[m_indexB].v;
|
65
|
-
float32 wB = data.velocities[m_indexB].w;
|
66
|
-
|
67
|
-
b2Rot qA(aA), qB(aB);
|
68
|
-
|
69
|
-
m_rA = b2Mul(qA, m_localAnchorA - m_localCenterA);
|
70
|
-
m_rB = b2Mul(qB, m_localAnchorB - m_localCenterB);
|
71
|
-
m_u = cB + m_rB - cA - m_rA;
|
72
|
-
|
73
|
-
m_length = m_u.Length();
|
74
|
-
|
75
|
-
float32 C = m_length - m_maxLength;
|
76
|
-
if (C > 0.0f)
|
77
|
-
{
|
78
|
-
m_state = e_atUpperLimit;
|
79
|
-
}
|
80
|
-
else
|
81
|
-
{
|
82
|
-
m_state = e_inactiveLimit;
|
83
|
-
}
|
84
|
-
|
85
|
-
if (m_length > b2_linearSlop)
|
86
|
-
{
|
87
|
-
m_u *= 1.0f / m_length;
|
88
|
-
}
|
89
|
-
else
|
90
|
-
{
|
91
|
-
m_u.SetZero();
|
92
|
-
m_mass = 0.0f;
|
93
|
-
m_impulse = 0.0f;
|
94
|
-
return;
|
95
|
-
}
|
96
|
-
|
97
|
-
// Compute effective mass.
|
98
|
-
float32 crA = b2Cross(m_rA, m_u);
|
99
|
-
float32 crB = b2Cross(m_rB, m_u);
|
100
|
-
float32 invMass = m_invMassA + m_invIA * crA * crA + m_invMassB + m_invIB * crB * crB;
|
101
|
-
|
102
|
-
m_mass = invMass != 0.0f ? 1.0f / invMass : 0.0f;
|
103
|
-
|
104
|
-
if (data.step.warmStarting)
|
105
|
-
{
|
106
|
-
// Scale the impulse to support a variable time step.
|
107
|
-
m_impulse *= data.step.dtRatio;
|
108
|
-
|
109
|
-
b2Vec2 P = m_impulse * m_u;
|
110
|
-
vA -= m_invMassA * P;
|
111
|
-
wA -= m_invIA * b2Cross(m_rA, P);
|
112
|
-
vB += m_invMassB * P;
|
113
|
-
wB += m_invIB * b2Cross(m_rB, P);
|
114
|
-
}
|
115
|
-
else
|
116
|
-
{
|
117
|
-
m_impulse = 0.0f;
|
118
|
-
}
|
119
|
-
|
120
|
-
data.velocities[m_indexA].v = vA;
|
121
|
-
data.velocities[m_indexA].w = wA;
|
122
|
-
data.velocities[m_indexB].v = vB;
|
123
|
-
data.velocities[m_indexB].w = wB;
|
124
|
-
}
|
125
|
-
|
126
|
-
void b2RopeJoint::SolveVelocityConstraints(const b2SolverData& data)
|
127
|
-
{
|
128
|
-
b2Vec2 vA = data.velocities[m_indexA].v;
|
129
|
-
float32 wA = data.velocities[m_indexA].w;
|
130
|
-
b2Vec2 vB = data.velocities[m_indexB].v;
|
131
|
-
float32 wB = data.velocities[m_indexB].w;
|
132
|
-
|
133
|
-
// Cdot = dot(u, v + cross(w, r))
|
134
|
-
b2Vec2 vpA = vA + b2Cross(wA, m_rA);
|
135
|
-
b2Vec2 vpB = vB + b2Cross(wB, m_rB);
|
136
|
-
float32 C = m_length - m_maxLength;
|
137
|
-
float32 Cdot = b2Dot(m_u, vpB - vpA);
|
138
|
-
|
139
|
-
// Predictive constraint.
|
140
|
-
if (C < 0.0f)
|
141
|
-
{
|
142
|
-
Cdot += data.step.inv_dt * C;
|
143
|
-
}
|
144
|
-
|
145
|
-
float32 impulse = -m_mass * Cdot;
|
146
|
-
float32 oldImpulse = m_impulse;
|
147
|
-
m_impulse = b2Min(0.0f, m_impulse + impulse);
|
148
|
-
impulse = m_impulse - oldImpulse;
|
149
|
-
|
150
|
-
b2Vec2 P = impulse * m_u;
|
151
|
-
vA -= m_invMassA * P;
|
152
|
-
wA -= m_invIA * b2Cross(m_rA, P);
|
153
|
-
vB += m_invMassB * P;
|
154
|
-
wB += m_invIB * b2Cross(m_rB, P);
|
155
|
-
|
156
|
-
data.velocities[m_indexA].v = vA;
|
157
|
-
data.velocities[m_indexA].w = wA;
|
158
|
-
data.velocities[m_indexB].v = vB;
|
159
|
-
data.velocities[m_indexB].w = wB;
|
160
|
-
}
|
161
|
-
|
162
|
-
bool b2RopeJoint::SolvePositionConstraints(const b2SolverData& data)
|
163
|
-
{
|
164
|
-
b2Vec2 cA = data.positions[m_indexA].c;
|
165
|
-
float32 aA = data.positions[m_indexA].a;
|
166
|
-
b2Vec2 cB = data.positions[m_indexB].c;
|
167
|
-
float32 aB = data.positions[m_indexB].a;
|
168
|
-
|
169
|
-
b2Rot qA(aA), qB(aB);
|
170
|
-
|
171
|
-
b2Vec2 rA = b2Mul(qA, m_localAnchorA - m_localCenterA);
|
172
|
-
b2Vec2 rB = b2Mul(qB, m_localAnchorB - m_localCenterB);
|
173
|
-
b2Vec2 u = cB + rB - cA - rA;
|
174
|
-
|
175
|
-
float32 length = u.Normalize();
|
176
|
-
float32 C = length - m_maxLength;
|
177
|
-
|
178
|
-
C = b2Clamp(C, 0.0f, b2_maxLinearCorrection);
|
179
|
-
|
180
|
-
float32 impulse = -m_mass * C;
|
181
|
-
b2Vec2 P = impulse * u;
|
182
|
-
|
183
|
-
cA -= m_invMassA * P;
|
184
|
-
aA -= m_invIA * b2Cross(rA, P);
|
185
|
-
cB += m_invMassB * P;
|
186
|
-
aB += m_invIB * b2Cross(rB, P);
|
187
|
-
|
188
|
-
data.positions[m_indexA].c = cA;
|
189
|
-
data.positions[m_indexA].a = aA;
|
190
|
-
data.positions[m_indexB].c = cB;
|
191
|
-
data.positions[m_indexB].a = aB;
|
192
|
-
|
193
|
-
return length - m_maxLength < b2_linearSlop;
|
194
|
-
}
|
195
|
-
|
196
|
-
b2Vec2 b2RopeJoint::GetAnchorA() const
|
197
|
-
{
|
198
|
-
return m_bodyA->GetWorldPoint(m_localAnchorA);
|
199
|
-
}
|
200
|
-
|
201
|
-
b2Vec2 b2RopeJoint::GetAnchorB() const
|
202
|
-
{
|
203
|
-
return m_bodyB->GetWorldPoint(m_localAnchorB);
|
204
|
-
}
|
205
|
-
|
206
|
-
b2Vec2 b2RopeJoint::GetReactionForce(float32 inv_dt) const
|
207
|
-
{
|
208
|
-
b2Vec2 F = (inv_dt * m_impulse) * m_u;
|
209
|
-
return F;
|
210
|
-
}
|
211
|
-
|
212
|
-
float32 b2RopeJoint::GetReactionTorque(float32 inv_dt) const
|
213
|
-
{
|
214
|
-
B2_NOT_USED(inv_dt);
|
215
|
-
return 0.0f;
|
216
|
-
}
|
217
|
-
|
218
|
-
float32 b2RopeJoint::GetMaxLength() const
|
219
|
-
{
|
220
|
-
return m_maxLength;
|
221
|
-
}
|
222
|
-
|
223
|
-
b2LimitState b2RopeJoint::GetLimitState() const
|
224
|
-
{
|
225
|
-
return m_state;
|
226
|
-
}
|
227
|
-
|
228
|
-
void b2RopeJoint::Dump()
|
229
|
-
{
|
230
|
-
int32 indexA = m_bodyA->m_islandIndex;
|
231
|
-
int32 indexB = m_bodyB->m_islandIndex;
|
232
|
-
|
233
|
-
b2Log(" b2RopeJointDef jd;\n");
|
234
|
-
b2Log(" jd.bodyA = bodies[%d];\n", indexA);
|
235
|
-
b2Log(" jd.bodyB = bodies[%d];\n", indexB);
|
236
|
-
b2Log(" jd.collideConnected = bool(%d);\n", m_collideConnected);
|
237
|
-
b2Log(" jd.localAnchorA.Set(%.15lef, %.15lef);\n", m_localAnchorA.x, m_localAnchorA.y);
|
238
|
-
b2Log(" jd.localAnchorB.Set(%.15lef, %.15lef);\n", m_localAnchorB.x, m_localAnchorB.y);
|
239
|
-
b2Log(" jd.maxLength = %.15lef;\n", m_maxLength);
|
240
|
-
b2Log(" joints[%d] = m_world->CreateJoint(&jd);\n", m_index);
|
241
|
-
}
|
@@ -1,114 +0,0 @@
|
|
1
|
-
/*
|
2
|
-
* Copyright (c) 2006-2011 Erin Catto http://www.box2d.org
|
3
|
-
*
|
4
|
-
* This software is provided 'as-is', without any express or implied
|
5
|
-
* warranty. In no event will the authors be held liable for any damages
|
6
|
-
* arising from the use of this software.
|
7
|
-
* Permission is granted to anyone to use this software for any purpose,
|
8
|
-
* including commercial applications, and to alter it and redistribute it
|
9
|
-
* freely, subject to the following restrictions:
|
10
|
-
* 1. The origin of this software must not be misrepresented; you must not
|
11
|
-
* claim that you wrote the original software. If you use this software
|
12
|
-
* in a product, an acknowledgment in the product documentation would be
|
13
|
-
* appreciated but is not required.
|
14
|
-
* 2. Altered source versions must be plainly marked as such, and must not be
|
15
|
-
* misrepresented as being the original software.
|
16
|
-
* 3. This notice may not be removed or altered from any source distribution.
|
17
|
-
*/
|
18
|
-
|
19
|
-
#ifndef B2_ROPE_JOINT_H
|
20
|
-
#define B2_ROPE_JOINT_H
|
21
|
-
|
22
|
-
#include <Box2D/Dynamics/Joints/b2Joint.h>
|
23
|
-
|
24
|
-
/// Rope joint definition. This requires two body anchor points and
|
25
|
-
/// a maximum lengths.
|
26
|
-
/// Note: by default the connected objects will not collide.
|
27
|
-
/// see collideConnected in b2JointDef.
|
28
|
-
struct b2RopeJointDef : public b2JointDef
|
29
|
-
{
|
30
|
-
b2RopeJointDef()
|
31
|
-
{
|
32
|
-
type = e_ropeJoint;
|
33
|
-
localAnchorA.Set(-1.0f, 0.0f);
|
34
|
-
localAnchorB.Set(1.0f, 0.0f);
|
35
|
-
maxLength = 0.0f;
|
36
|
-
}
|
37
|
-
|
38
|
-
/// The local anchor point relative to bodyA's origin.
|
39
|
-
b2Vec2 localAnchorA;
|
40
|
-
|
41
|
-
/// The local anchor point relative to bodyB's origin.
|
42
|
-
b2Vec2 localAnchorB;
|
43
|
-
|
44
|
-
/// The maximum length of the rope.
|
45
|
-
/// Warning: this must be larger than b2_linearSlop or
|
46
|
-
/// the joint will have no effect.
|
47
|
-
float32 maxLength;
|
48
|
-
};
|
49
|
-
|
50
|
-
/// A rope joint enforces a maximum distance between two points
|
51
|
-
/// on two bodies. It has no other effect.
|
52
|
-
/// Warning: if you attempt to change the maximum length during
|
53
|
-
/// the simulation you will get some non-physical behavior.
|
54
|
-
/// A model that would allow you to dynamically modify the length
|
55
|
-
/// would have some sponginess, so I chose not to implement it
|
56
|
-
/// that way. See b2DistanceJoint if you want to dynamically
|
57
|
-
/// control length.
|
58
|
-
class b2RopeJoint : public b2Joint
|
59
|
-
{
|
60
|
-
public:
|
61
|
-
b2Vec2 GetAnchorA() const;
|
62
|
-
b2Vec2 GetAnchorB() const;
|
63
|
-
|
64
|
-
b2Vec2 GetReactionForce(float32 inv_dt) const;
|
65
|
-
float32 GetReactionTorque(float32 inv_dt) const;
|
66
|
-
|
67
|
-
/// The local anchor point relative to bodyA's origin.
|
68
|
-
const b2Vec2& GetLocalAnchorA() const { return m_localAnchorA; }
|
69
|
-
|
70
|
-
/// The local anchor point relative to bodyB's origin.
|
71
|
-
const b2Vec2& GetLocalAnchorB() const { return m_localAnchorB; }
|
72
|
-
|
73
|
-
/// Set/Get the maximum length of the rope.
|
74
|
-
void SetMaxLength(float32 length) { m_maxLength = length; }
|
75
|
-
float32 GetMaxLength() const;
|
76
|
-
|
77
|
-
b2LimitState GetLimitState() const;
|
78
|
-
|
79
|
-
/// Dump joint to dmLog
|
80
|
-
void Dump();
|
81
|
-
|
82
|
-
protected:
|
83
|
-
|
84
|
-
friend class b2Joint;
|
85
|
-
b2RopeJoint(const b2RopeJointDef* data);
|
86
|
-
|
87
|
-
void InitVelocityConstraints(const b2SolverData& data);
|
88
|
-
void SolveVelocityConstraints(const b2SolverData& data);
|
89
|
-
bool SolvePositionConstraints(const b2SolverData& data);
|
90
|
-
|
91
|
-
// Solver shared
|
92
|
-
b2Vec2 m_localAnchorA;
|
93
|
-
b2Vec2 m_localAnchorB;
|
94
|
-
float32 m_maxLength;
|
95
|
-
float32 m_length;
|
96
|
-
float32 m_impulse;
|
97
|
-
|
98
|
-
// Solver temp
|
99
|
-
int32 m_indexA;
|
100
|
-
int32 m_indexB;
|
101
|
-
b2Vec2 m_u;
|
102
|
-
b2Vec2 m_rA;
|
103
|
-
b2Vec2 m_rB;
|
104
|
-
b2Vec2 m_localCenterA;
|
105
|
-
b2Vec2 m_localCenterB;
|
106
|
-
float32 m_invMassA;
|
107
|
-
float32 m_invMassB;
|
108
|
-
float32 m_invIA;
|
109
|
-
float32 m_invIB;
|
110
|
-
float32 m_mass;
|
111
|
-
b2LimitState m_state;
|
112
|
-
};
|
113
|
-
|
114
|
-
#endif
|