gosu 0.7.45-x86-mingw32 → 0.7.46-x86-mingw32

Sign up to get free protection for your applications and to get access to all the features.
data/COPYING CHANGED
@@ -1,4 +1,4 @@
1
- Copyright (C) 2004-2012 Julian Raschke, Jan Lücker and all contributors.
1
+ Copyright (C) 2004-2013 Julian Raschke, Jan Lücker and all contributors.
2
2
 
3
3
  Permission is hereby granted, free of charge, to any person obtaining a
4
4
  copy of this software and associated documentation files (the "Software"),
@@ -18,17 +18,12 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
18
18
  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
19
19
  DEALINGS IN THE SOFTWARE.
20
20
 
21
- Julian Raschke julian@raschke.de
22
- Jan Lücker jan.luecker@gmx.de
21
+ Julian Raschke <julian@raschke.de> & contributors
23
22
  http://www.libgosu.org/
24
23
 
25
24
  ***
26
25
 
27
- This does NOT apply to audiere.dll shipped with the Windows versions of
28
- Gosu. Audiere is a separate library licensed under the Lesser General
29
- Public License. Please consult http://audiere.sf.net/ for more details.
30
-
31
- This does also NOT apply to libogg and libvorbis, which are included in
32
- all source and binary distributions of Gosu, sometimes via audiere. These
33
- projects are licensed under a BSD-like license, and their copyright terms
34
- need to be supplied even with binary redistributions (e.g. Gosu games).
26
+ This does NOT apply to libogg and libvorbis, which are included in all source
27
+ and binary distributions of Gosu. These projects are licensed under a BSD-like
28
+ license, and their copyright terms need to be supplied even with binary
29
+ redistributions (e.g. Gosu games).
@@ -126,14 +126,101 @@ namespace Gosu
126
126
  gpButton13,
127
127
  gpButton14,
128
128
  gpButton15,
129
- gpRangeEnd = gpButton15,
129
+
130
+ gp0Left,
131
+ gp0Right,
132
+ gp0Up,
133
+ gp0Down,
134
+ gp0Button0,
135
+ gp0Button1,
136
+ gp0Button2,
137
+ gp0Button3,
138
+ gp0Button4,
139
+ gp0Button5,
140
+ gp0Button6,
141
+ gp0Button7,
142
+ gp0Button8,
143
+ gp0Button9,
144
+ gp0Button10,
145
+ gp0Button11,
146
+ gp0Button12,
147
+ gp0Button13,
148
+ gp0Button14,
149
+ gp0Button15,
150
+
151
+ gp1Left,
152
+ gp1Right,
153
+ gp1Up,
154
+ gp1Down,
155
+ gp1Button0,
156
+ gp1Button1,
157
+ gp1Button2,
158
+ gp1Button3,
159
+ gp1Button4,
160
+ gp1Button5,
161
+ gp1Button6,
162
+ gp1Button7,
163
+ gp1Button8,
164
+ gp1Button9,
165
+ gp1Button10,
166
+ gp1Button11,
167
+ gp1Button12,
168
+ gp1Button13,
169
+ gp1Button14,
170
+ gp1Button15,
171
+
172
+ gp2Left,
173
+ gp2Right,
174
+ gp2Up,
175
+ gp2Down,
176
+ gp2Button0,
177
+ gp2Button1,
178
+ gp2Button2,
179
+ gp2Button3,
180
+ gp2Button4,
181
+ gp2Button5,
182
+ gp2Button6,
183
+ gp2Button7,
184
+ gp2Button8,
185
+ gp2Button9,
186
+ gp2Button10,
187
+ gp2Button11,
188
+ gp2Button12,
189
+ gp2Button13,
190
+ gp2Button14,
191
+ gp2Button15,
192
+
193
+ gp3Left,
194
+ gp3Right,
195
+ gp3Up,
196
+ gp3Down,
197
+ gp3Button0,
198
+ gp3Button1,
199
+ gp3Button2,
200
+ gp3Button3,
201
+ gp3Button4,
202
+ gp3Button5,
203
+ gp3Button6,
204
+ gp3Button7,
205
+ gp3Button8,
206
+ gp3Button9,
207
+ gp3Button10,
208
+ gp3Button11,
209
+ gp3Button12,
210
+ gp3Button13,
211
+ gp3Button14,
212
+ gp3Button15,
213
+
214
+ gpRangeEnd = gp3Button15,
215
+
216
+ numButtons = gpRangeEnd + 1,
217
+ numGamepads = 4,
218
+ noButton = 0xffffffff,
130
219
 
131
220
  kbNum = kbRangeEnd - kbRangeBegin + 1,
132
221
  msNum = msRangeEnd - msRangeBegin + 1,
133
222
  gpNum = gpRangeEnd - gpRangeBegin + 1,
134
-
135
- numButtons = gpRangeEnd,
136
- noButton = 0xffffffff
223
+ gpNumPerGamepad = gpNum / (numGamepads + 1),
137
224
  };
138
225
  }
139
226
 
@@ -126,14 +126,101 @@ namespace Gosu
126
126
  gpButton13,
127
127
  gpButton14,
128
128
  gpButton15,
129
- gpRangeEnd = gpButton15,
129
+
130
+ gp0Left,
131
+ gp0Right,
132
+ gp0Up,
133
+ gp0Down,
134
+ gp0Button0,
135
+ gp0Button1,
136
+ gp0Button2,
137
+ gp0Button3,
138
+ gp0Button4,
139
+ gp0Button5,
140
+ gp0Button6,
141
+ gp0Button7,
142
+ gp0Button8,
143
+ gp0Button9,
144
+ gp0Button10,
145
+ gp0Button11,
146
+ gp0Button12,
147
+ gp0Button13,
148
+ gp0Button14,
149
+ gp0Button15,
150
+
151
+ gp1Left,
152
+ gp1Right,
153
+ gp1Up,
154
+ gp1Down,
155
+ gp1Button0,
156
+ gp1Button1,
157
+ gp1Button2,
158
+ gp1Button3,
159
+ gp1Button4,
160
+ gp1Button5,
161
+ gp1Button6,
162
+ gp1Button7,
163
+ gp1Button8,
164
+ gp1Button9,
165
+ gp1Button10,
166
+ gp1Button11,
167
+ gp1Button12,
168
+ gp1Button13,
169
+ gp1Button14,
170
+ gp1Button15,
171
+
172
+ gp2Left,
173
+ gp2Right,
174
+ gp2Up,
175
+ gp2Down,
176
+ gp2Button0,
177
+ gp2Button1,
178
+ gp2Button2,
179
+ gp2Button3,
180
+ gp2Button4,
181
+ gp2Button5,
182
+ gp2Button6,
183
+ gp2Button7,
184
+ gp2Button8,
185
+ gp2Button9,
186
+ gp2Button10,
187
+ gp2Button11,
188
+ gp2Button12,
189
+ gp2Button13,
190
+ gp2Button14,
191
+ gp2Button15,
192
+
193
+ gp3Left,
194
+ gp3Right,
195
+ gp3Up,
196
+ gp3Down,
197
+ gp3Button0,
198
+ gp3Button1,
199
+ gp3Button2,
200
+ gp3Button3,
201
+ gp3Button4,
202
+ gp3Button5,
203
+ gp3Button6,
204
+ gp3Button7,
205
+ gp3Button8,
206
+ gp3Button9,
207
+ gp3Button10,
208
+ gp3Button11,
209
+ gp3Button12,
210
+ gp3Button13,
211
+ gp3Button14,
212
+ gp3Button15,
213
+
214
+ gpRangeEnd = gp3Button15,
215
+
216
+ numButtons = gpRangeEnd + 1,
217
+ numGamepads = 4,
218
+ noButton = 0xffffffff,
130
219
 
131
220
  kbNum = kbRangeEnd - kbRangeBegin + 1,
132
221
  msNum = msRangeEnd - msRangeBegin + 1,
133
222
  gpNum = gpRangeEnd - gpRangeBegin + 1,
134
-
135
- numButtons = gpRangeEnd + 1,
136
- noButton = 0xffffffff
223
+ gpNumPerGamepad = gpNum / (numGamepads + 1),
137
224
  };
138
225
  }
139
226
 
@@ -23,7 +23,17 @@ namespace Gosu
23
23
  //! Useful when extending Gosu using OpenGL.
24
24
  unsigned const MAX_TEXTURE_SIZE = 1024;
25
25
 
26
+ #ifdef GOSU_IS_MAC
27
+ struct Transform
28
+ {
29
+ double value[16];
30
+ bool operator==(const Transform &other) { for (int i = 0; i < 16; ++i) if ((*this)[i] != other[i]) return false; return true; }
31
+ const double &operator[](std::size_t idx) const { return value[idx]; }
32
+ double &operator[](std::size_t idx) { return value[idx]; }
33
+ };
34
+ #else
26
35
  typedef std::tr1::array<double, 16> Transform;
36
+ #endif
27
37
  Transform translate(double x, double y);
28
38
  Transform rotate(double angle, double aroundX = 0, double aroundY = 0);
29
39
  Transform scale(double factor);
@@ -6,6 +6,7 @@
6
6
 
7
7
  #include <Gosu/Color.hpp>
8
8
  #include <Gosu/GraphicsBase.hpp>
9
+ #include <Gosu/Fwd.hpp>
9
10
 
10
11
  namespace Gosu
11
12
  {
@@ -8,7 +8,7 @@
8
8
  #include <Gosu/Platform.hpp>
9
9
 
10
10
  #ifdef GOSU_IS_WIN
11
- #include <Gosu/ButtonsWin.hpp>
11
+ #include <Gosu/Buttons.hpp>
12
12
  #ifndef NOMINMAX
13
13
  #define NOMINMAX
14
14
  #endif
@@ -20,10 +20,9 @@
20
20
  #endif
21
21
 
22
22
  #ifdef GOSU_IS_X
23
+ #include <Gosu/Buttons.hpp>
23
24
  #include <X11/Xlib.h>
24
25
  #include <X11/Xutil.h>
25
- #include <X11/keysym.h>
26
- #include <Gosu/ButtonsX.hpp>
27
26
  #endif
28
27
 
29
28
  #include <Gosu/Platform.hpp>
@@ -3,8 +3,8 @@
3
3
 
4
4
  #define GOSU_MAJOR_VERSION 0
5
5
  #define GOSU_MINOR_VERSION 7
6
- #define GOSU_POINT_VERSION 45
7
- #define GOSU_VERSION "0.7.45"
6
+ #define GOSU_POINT_VERSION 46
7
+ #define GOSU_VERSION "0.7.46"
8
8
 
9
9
  #define GOSU_COPYRIGHT_NOTICE \
10
10
  " " \
@@ -74,7 +74,7 @@ namespace Gosu
74
74
  //! This function is called when the operating system's memory is low.
75
75
  //! So far, it is only called in iOS applications.
76
76
  virtual void releaseMemory() {}
77
-
77
+
78
78
  //! Called before update when the user pressed a button while the
79
79
  //! window had the focus.
80
80
  virtual void buttonDown(Gosu::Button) {}
Binary file
Binary file
@@ -27,8 +27,8 @@ class Gosu::Window
27
27
  end
28
28
 
29
29
  def gl(*args, &block)
30
- $gosu_blocks ||= []
31
- $gosu_blocks << block
30
+ $gosu_gl_blocks ||= []
31
+ $gosu_gl_blocks << block
32
32
  unsafe_gl(*args, &block)
33
33
  end
34
34
 
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: gosu
3
3
  version: !ruby/object:Gem::Version
4
- hash: 89
4
+ hash: 95
5
5
  prerelease:
6
6
  segments:
7
7
  - 0
8
8
  - 7
9
- - 45
10
- version: 0.7.45
9
+ - 46
10
+ version: 0.7.46
11
11
  platform: x86-mingw32
12
12
  authors:
13
13
  - Julian Raschke
@@ -15,7 +15,7 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2012-07-19 00:00:00 Z
18
+ date: 2013-03-31 00:00:00 Z
19
19
  dependencies: []
20
20
 
21
21
  description: " 2D game development library.\n\n Gosu features easy to use and game-friendly interfaces to 2D graphics\n and text (accelerated by 3D hardware), sound samples and music as well as\n keyboard, mouse and gamepad/joystick input.\n\n Also includes demos for integration with RMagick, Chipmunk and OpenGL.\n"
@@ -34,9 +34,8 @@ files:
34
34
  - Gosu/Audio.hpp
35
35
  - Gosu/AutoLink.hpp
36
36
  - Gosu/Bitmap.hpp
37
+ - Gosu/Buttons.hpp
37
38
  - Gosu/ButtonsMac.hpp
38
- - Gosu/ButtonsWin.hpp
39
- - Gosu/ButtonsX.hpp
40
39
  - Gosu/Color.hpp
41
40
  - Gosu/Directories.hpp
42
41
  - Gosu/Font.hpp
@@ -44,28 +43,28 @@ files:
44
43
  - Gosu/Gosu.hpp
45
44
  - Gosu/Graphics.hpp
46
45
  - Gosu/GraphicsBase.hpp
46
+ - Gosu/IO.hpp
47
47
  - Gosu/Image.hpp
48
48
  - Gosu/ImageData.hpp
49
49
  - Gosu/Input.hpp
50
50
  - Gosu/Inspection.hpp
51
- - Gosu/IO.hpp
52
51
  - Gosu/Math.hpp
53
52
  - Gosu/Platform.hpp
54
53
  - Gosu/Sockets.hpp
54
+ - Gosu/TR1.hpp
55
55
  - Gosu/Text.hpp
56
56
  - Gosu/TextInput.hpp
57
57
  - Gosu/Timing.hpp
58
- - Gosu/TR1.hpp
59
58
  - Gosu/Utility.hpp
60
59
  - Gosu/Version.hpp
61
- - Gosu/Window.hpp
62
60
  - Gosu/WinUtility.hpp
61
+ - Gosu/Window.hpp
62
+ - lib/gosu.rb
63
63
  - lib/gosu/patches.rb
64
64
  - lib/gosu/preview.rb
65
65
  - lib/gosu/run.rb
66
66
  - lib/gosu/swig_patches.rb
67
67
  - lib/gosu/zen.rb
68
- - lib/gosu.rb
69
68
  - examples/ChipmunkIntegration.rb
70
69
  - examples/CptnRuby.rb
71
70
  - examples/GosuZen.rb
@@ -97,8 +96,8 @@ files:
97
96
  - lib/gosu.for_1_8.so
98
97
  - lib/gosu.for_1_9.so
99
98
  - lib/FreeImage.dll
100
- - lib/libsndfile.dll
101
99
  - lib/OpenAL32.dll
100
+ - lib/libsndfile.dll
102
101
  homepage: http://www.libgosu.org/
103
102
  licenses: []
104
103
 
@@ -1,141 +0,0 @@
1
- #ifndef GOSU_BUTTONSX_HPP
2
- #define GOSU_BUTTONSX_HPP
3
-
4
- namespace Gosu
5
- {
6
- //! List of button ids that can be used with Gosu::Input.
7
- //! This enumeration contains ids for keyboard keys (kb*),
8
- //! mouse buttons and mouse wheel (ms*) and gamepad buttons (gp*).
9
- enum ButtonName
10
- {
11
- kbRangeBegin = 0x00,
12
- kbA = 'a',
13
- kbB = 'b',
14
- kbC = 'c',
15
- kbD = 'd',
16
- kbE = 'e',
17
- kbF = 'f',
18
- kbG = 'g',
19
- kbH = 'h',
20
- kbI = 'i',
21
- kbJ = 'j',
22
- kbK = 'k',
23
- kbL = 'l',
24
- kbM = 'm',
25
- kbN = 'n',
26
- kbO = 'o',
27
- kbP = 'p',
28
- kbQ = 'q',
29
- kbR = 'r',
30
- kbS = 's',
31
- kbT = 't',
32
- kbU = 'u',
33
- kbV = 'v',
34
- kbW = 'w',
35
- kbX = 'x',
36
- kbY = 'y',
37
- kbZ = 'z',
38
- kbEscape = XK_Escape,
39
- kbF1 = XK_F1,
40
- kbF2 = XK_F2,
41
- kbF3 = XK_F3,
42
- kbF4 = XK_F4,
43
- kbF5 = XK_F5,
44
- kbF6 = XK_F6,
45
- kbF7 = XK_F7,
46
- kbF8 = XK_F8,
47
- kbF9 = XK_F9,
48
- kbF10 = XK_F10,
49
- kbF11 = XK_F11,
50
- kbF12 = XK_F12,
51
- kb1 = XK_1,
52
- kb2 = XK_2,
53
- kb3 = XK_3,
54
- kb4 = XK_4,
55
- kb5 = XK_5,
56
- kb6 = XK_6,
57
- kb7 = XK_7,
58
- kb8 = XK_8,
59
- kb9 = XK_9,
60
- kb0 = XK_0,
61
- kbTab = XK_Tab,
62
- kbReturn = XK_Return,
63
- kbSpace = XK_space,
64
- kbLeftShift = XK_Shift_L,
65
- kbRightShift = XK_Shift_R,
66
- kbLeftControl = XK_Control_L,
67
- kbRightControl = XK_Control_R,
68
- kbLeftAlt = XK_Alt_L,
69
- kbRightAlt = XK_Alt_R,
70
- kbLeftMeta = XK_Meta_L,
71
- kbRightMeta = XK_Meta_R,
72
- kbBackspace = XK_BackSpace,
73
- kbLeft = XK_Left,
74
- kbRight = XK_Right,
75
- kbUp = XK_Up,
76
- kbDown = XK_Down,
77
- kbHome = XK_Home,
78
- kbEnd = XK_End,
79
- kbInsert = XK_Insert,
80
- kbDelete = XK_Delete,
81
- kbPageUp = XK_Prior,
82
- kbPageDown = XK_Next,
83
- kbEnter = XK_KP_Enter,
84
- kbNumpad1 = XK_KP_1,
85
- kbNumpad2 = XK_KP_2,
86
- kbNumpad3 = XK_KP_3,
87
- kbNumpad4 = XK_KP_4,
88
- kbNumpad5 = XK_KP_5,
89
- kbNumpad6 = XK_KP_6,
90
- kbNumpad7 = XK_KP_7,
91
- kbNumpad8 = XK_KP_8,
92
- kbNumpad9 = XK_KP_9,
93
- kbNumpad0 = XK_KP_0,
94
- kbNumpadAdd = XK_KP_Add,
95
- kbNumpadSubtract = XK_KP_Subtract,
96
- kbNumpadMultiply = XK_KP_Multiply,
97
- kbNumpadDivide = XK_KP_Divide,
98
- kbRangeEnd = 0xffff,
99
-
100
- msRangeBegin,
101
- msLeft = msRangeBegin,
102
- msRight,
103
- msMiddle,
104
- msWheelUp,
105
- msWheelDown,
106
- msRangeEnd,
107
-
108
- gpRangeBegin,
109
- gpLeft = gpRangeBegin,
110
- gpRight,
111
- gpUp,
112
- gpDown,
113
- gpButton0,
114
- gpButton1,
115
- gpButton2,
116
- gpButton3,
117
- gpButton4,
118
- gpButton5,
119
- gpButton6,
120
- gpButton7,
121
- gpButton8,
122
- gpButton9,
123
- gpButton10,
124
- gpButton11,
125
- gpButton12,
126
- gpButton13,
127
- gpButton14,
128
- gpButton15,
129
- gpRangeEnd = gpButton15,
130
-
131
- kbNum = kbRangeEnd - kbRangeBegin + 1,
132
- msNum = msRangeEnd - msRangeBegin + 1,
133
- gpNum = gpRangeEnd - gpRangeBegin + 1,
134
-
135
- numButtons = gpRangeEnd,
136
- noButton = 0xffffffff
137
- };
138
- }
139
-
140
- #endif
141
-