Skip to content

Commit 7f5f189

Browse files
authored
Merge pull request #270 from mips64-el/master
Remove unneeded inline keyword from class methods
2 parents 27b6b12 + 1f37420 commit 7f5f189

32 files changed

+519
-519
lines changed

include/AudioDevice.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class AudioDevice {
3636
*
3737
* @throws raylib::RaylibException Throws if the AudioDevice failed to initialize.
3838
*/
39-
inline void Init() {
39+
void Init() {
4040
::InitAudioDevice();
4141
if (!IsReady()) {
4242
throw RaylibException("Failed to initialize AudioDevice");
@@ -46,14 +46,14 @@ class AudioDevice {
4646
/**
4747
* Close the audio device and context.
4848
*/
49-
inline void Close() {
49+
void Close() {
5050
::CloseAudioDevice();
5151
}
5252

5353
/**
5454
* Check if audio device has been initialized successfully.
5555
*/
56-
inline bool IsReady() const {
56+
bool IsReady() const {
5757
return ::IsAudioDeviceReady();
5858
}
5959

@@ -62,7 +62,7 @@ class AudioDevice {
6262
*
6363
* @param volume The desired volume to set.
6464
*/
65-
inline AudioDevice& SetVolume(float volume) {
65+
AudioDevice& SetVolume(float volume) {
6666
::SetMasterVolume(volume);
6767
return *this;
6868
}

include/AudioStream.hpp

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -81,113 +81,113 @@ class AudioStream : public ::AudioStream {
8181
/**
8282
* Update audio stream buffers with data
8383
*/
84-
inline AudioStream& Update(const void *data, int samplesCount) {
84+
AudioStream& Update(const void *data, int samplesCount) {
8585
::UpdateAudioStream(*this, data, samplesCount);
8686
return *this;
8787
}
8888

8989
/**
9090
* Unload audio stream and free memory
9191
*/
92-
inline void Unload() {
92+
void Unload() {
9393
::UnloadAudioStream(*this);
9494
}
9595

9696
/**
9797
* Check if any audio stream buffers requires refill
9898
*/
99-
inline bool IsProcessed() const {
99+
bool IsProcessed() const {
100100
return ::IsAudioStreamProcessed(*this);
101101
}
102102

103103
/**
104104
* Play audio stream
105105
*/
106-
inline AudioStream& Play() {
106+
AudioStream& Play() {
107107
::PlayAudioStream(*this);
108108
return *this;
109109
}
110110

111111
/**
112112
* Pause audio stream
113113
*/
114-
inline AudioStream& Pause() {
114+
AudioStream& Pause() {
115115
::PauseAudioStream(*this);
116116
return *this;
117117
}
118118

119119
/**
120120
* Resume audio stream
121121
*/
122-
inline AudioStream& Resume() {
122+
AudioStream& Resume() {
123123
::ResumeAudioStream(*this);
124124
return *this;
125125
}
126126

127127
/**
128128
* Check if audio stream is playing
129129
*/
130-
inline bool IsPlaying() const {
130+
bool IsPlaying() const {
131131
return ::IsAudioStreamPlaying(*this);
132132
}
133133

134134
/**
135135
* Stop audio stream
136136
*/
137-
inline AudioStream& Stop() {
137+
AudioStream& Stop() {
138138
::StopAudioStream(*this);
139139
return *this;
140140
}
141141

142142
/**
143143
* Set volume for audio stream (1.0 is max level)
144144
*/
145-
inline AudioStream& SetVolume(float volume = 1.0f) {
145+
AudioStream& SetVolume(float volume = 1.0f) {
146146
::SetAudioStreamVolume(*this, volume);
147147
return *this;
148148
}
149149

150150
/**
151151
* Set pitch for audio stream (1.0 is base level)
152152
*/
153-
inline AudioStream& SetPitch(float pitch) {
153+
AudioStream& SetPitch(float pitch) {
154154
::SetAudioStreamPitch(*this, pitch);
155155
return *this;
156156
}
157157

158158
/**
159159
* Set pan for audio stream (0.5 is centered)
160160
*/
161-
inline AudioStream& SetPan(float pan = 0.5f) {
161+
AudioStream& SetPan(float pan = 0.5f) {
162162
::SetAudioStreamPitch(*this, pan);
163163
return *this;
164164
}
165165

166166
/**
167167
* Default size for new audio streams
168168
*/
169-
inline static void SetBufferSizeDefault(int size) {
169+
static void SetBufferSizeDefault(int size) {
170170
::SetAudioStreamBufferSizeDefault(size);
171171
}
172172

173173
/**
174174
* Audio thread callback to request new data
175175
*/
176-
inline void SetCallback(::AudioCallback callback) {
176+
void SetCallback(::AudioCallback callback) {
177177
::SetAudioStreamCallback(*this, callback);
178178
}
179179

180180
/**
181181
* Attach audio stream processor to stream
182182
*/
183-
inline void AttachProcessor(::AudioCallback processor) {
183+
void AttachProcessor(::AudioCallback processor) {
184184
::SetAudioStreamCallback(*this, processor);
185185
}
186186

187187
/**
188188
* Detach audio stream processor from stream
189189
*/
190-
inline void DetachProcessor(::AudioCallback processor) {
190+
void DetachProcessor(::AudioCallback processor) {
191191
::SetAudioStreamCallback(*this, processor);
192192
}
193193

include/AutomationEventList.hpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -81,39 +81,39 @@ class AutomationEventList : public ::AutomationEventList {
8181
/**
8282
* Update audio stream buffers with data
8383
*/
84-
inline AutomationEventList& Unload() {
84+
AutomationEventList& Unload() {
8585
::UnloadAutomationEventList(this);
8686
return *this;
8787
}
8888

89-
inline bool IsReady() {
89+
bool IsReady() {
9090
return events != nullptr;
9191
}
9292

93-
inline bool Export(const char* fileName) {
93+
bool Export(const char* fileName) {
9494
return ::ExportAutomationEventList(*this, fileName);
9595
}
9696

97-
inline void Set() {
97+
void Set() {
9898
::SetAutomationEventList(this);
9999
}
100100

101-
inline void SetBaseFrame(int frame) {
101+
void SetBaseFrame(int frame) {
102102
Set();
103103
::SetAutomationEventBaseFrame(frame);
104104
}
105105

106-
inline void StartRecording() {
106+
void StartRecording() {
107107
Set();
108108
::StartAutomationEventRecording();
109109
}
110110

111-
inline void StopRecording() {
111+
void StopRecording() {
112112
Set();
113113
::StopAutomationEventRecording();
114114
}
115115

116-
inline void Play(int index) {
116+
void Play(int index) {
117117
if (index < 0 || index >= this->count) {
118118
return;
119119
}

include/BoundingBox.hpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,35 +38,35 @@ class BoundingBox : public ::BoundingBox {
3838
/**
3939
* Draw a bounding box with wires
4040
*/
41-
inline void Draw(::Color color = {255, 255, 255, 255}) const {
41+
void Draw(::Color color = {255, 255, 255, 255}) const {
4242
::DrawBoundingBox(*this, color);
4343
}
4444

4545
/**
4646
* Detect collision between two boxes
4747
*/
48-
inline bool CheckCollision(const ::BoundingBox& box2) const {
48+
bool CheckCollision(const ::BoundingBox& box2) const {
4949
return CheckCollisionBoxes(*this, box2);
5050
}
5151

5252
/**
5353
* Detect collision between box and sphere
5454
*/
55-
inline bool CheckCollision(::Vector3 center, float radius) const {
55+
bool CheckCollision(::Vector3 center, float radius) const {
5656
return CheckCollisionBoxSphere(*this, center, radius);
5757
}
5858

5959
/**
6060
* Detect collision between ray and bounding box
6161
*/
62-
inline bool CheckCollision(const ::Ray& ray) const {
62+
bool CheckCollision(const ::Ray& ray) const {
6363
return GetRayCollisionBox(ray, *this).hit;
6464
}
6565

6666
/**
6767
* Get collision information between ray and bounding box
6868
*/
69-
inline RayCollision GetCollision(const ::Ray& ray) const {
69+
RayCollision GetCollision(const ::Ray& ray) const {
7070
return GetRayCollisionBox(ray, *this);
7171
}
7272

include/Camera2D.hpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ class Camera2D : public ::Camera2D {
1919
Camera2D(::Vector2 offset, ::Vector2 target,
2020
float rotation = 0.0f, float zoom = 1.0f) : ::Camera2D{offset, target, rotation, zoom} {}
2121

22-
inline Camera2D& BeginMode() {
22+
Camera2D& BeginMode() {
2323
::BeginMode2D(*this);
2424
return *this;
2525
}
2626

27-
inline Camera2D& EndMode() {
27+
Camera2D& EndMode() {
2828
::EndMode2D();
2929
return *this;
3030
}
@@ -42,21 +42,21 @@ class Camera2D : public ::Camera2D {
4242
/**
4343
* Returns camera 2d transform matrix
4444
*/
45-
inline Matrix GetMatrix() const {
45+
Matrix GetMatrix() const {
4646
return ::GetCameraMatrix2D(*this);
4747
}
4848

4949
/**
5050
* Returns the world space position for a 2d camera screen space position
5151
*/
52-
inline Vector2 GetScreenToWorld(::Vector2 position) const {
52+
Vector2 GetScreenToWorld(::Vector2 position) const {
5353
return ::GetScreenToWorld2D(position, *this);
5454
}
5555

5656
/**
5757
* Returns the screen space position for a 3d world space position
5858
*/
59-
inline Vector2 GetWorldToScreen(::Vector2 position) const {
59+
Vector2 GetWorldToScreen(::Vector2 position) const {
6060
return ::GetWorldToScreen2D(position, *this);
6161
}
6262

include/Camera3D.hpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,44 +62,44 @@ class Camera3D : public ::Camera3D {
6262
/**
6363
* Get camera transform matrix (view matrix)
6464
*/
65-
inline Matrix GetMatrix() const {
65+
Matrix GetMatrix() const {
6666
return ::GetCameraMatrix(*this);
6767
}
6868

6969
/**
7070
* Update camera position for selected mode
7171
*/
72-
inline Camera3D& Update(int mode) {
72+
Camera3D& Update(int mode) {
7373
::UpdateCamera(this, mode);
7474
return *this;
7575
}
7676

7777
/**
7878
* Update camera movement/rotation
7979
*/
80-
inline Camera3D& Update(::Vector3 movement, ::Vector3 rotation, float zoom = 1.0f) {
80+
Camera3D& Update(::Vector3 movement, ::Vector3 rotation, float zoom = 1.0f) {
8181
::UpdateCameraPro(this, movement, rotation, zoom);
8282
return *this;
8383
}
8484

8585
/**
8686
* Returns a ray trace from mouse position
8787
*/
88-
inline Ray GetMouseRay(::Vector2 mousePosition) const {
88+
Ray GetMouseRay(::Vector2 mousePosition) const {
8989
return ::GetMouseRay(mousePosition, *this);
9090
}
9191

9292
/**
9393
* Returns the screen space position for a 3d world space position
9494
*/
95-
inline Vector2 GetWorldToScreen(::Vector3 position) const {
95+
Vector2 GetWorldToScreen(::Vector3 position) const {
9696
return ::GetWorldToScreen(position, *this);
9797
}
9898

9999
/**
100100
* Draw a billboard texture.
101101
*/
102-
inline void DrawBillboard(
102+
void DrawBillboard(
103103
const ::Texture2D& texture,
104104
::Vector3 center,
105105
float size,
@@ -110,7 +110,7 @@ class Camera3D : public ::Camera3D {
110110
/**
111111
* Draw a billboard texture defined by source.
112112
*/
113-
inline void DrawBillboard(
113+
void DrawBillboard(
114114
const ::Texture2D& texture,
115115
::Rectangle sourceRec,
116116
::Vector3 center,

0 commit comments

Comments
 (0)