Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ if (NOT raylib_FOUND)
FetchContent_Declare(
raylib
GIT_REPOSITORY https://github.com/raysan5/raylib.git
GIT_TAG 4.0.0
GIT_TAG 1f806b555dd1ecb7e77797ed0de57d62a6bdd6f0
)
FetchContent_GetProperties(raylib)
if (NOT raylib_POPULATED) # Have we downloaded raylib yet?
Expand Down
7 changes: 6 additions & 1 deletion include/AudioStream.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@ class AudioStream : public ::AudioStream {
}

AudioStream(rAudioBuffer* buffer = nullptr,
rAudioProcessor *processor = nullptr,
unsigned int sampleRate = 0,
unsigned int sampleSize = 0,
unsigned int channels = 0) : ::AudioStream{buffer, sampleRate, sampleSize, channels} {
unsigned int channels = 0) : ::AudioStream{buffer, processor, sampleRate, sampleSize, channels} {
// Nothing.
}

Expand All @@ -39,6 +40,7 @@ class AudioStream : public ::AudioStream {
set(other);

other.buffer = nullptr;
other.processor = nullptr;
other.sampleRate = 0;
other.sampleSize = 0;
other.channels = 0;
Expand All @@ -49,6 +51,7 @@ class AudioStream : public ::AudioStream {
}

GETTERSETTER(rAudioBuffer *, Buffer, buffer)
GETTERSETTER(rAudioProcessor *, Processor, processor)
GETTERSETTER(unsigned int, SampleRate, sampleRate)
GETTERSETTER(unsigned int, SampleSize, sampleSize)
GETTERSETTER(unsigned int, Channels, channels)
Expand All @@ -69,6 +72,7 @@ class AudioStream : public ::AudioStream {
set(other);

other.buffer = nullptr;
other.processor = nullptr;
other.sampleRate = 0;
other.sampleSize = 0;
other.channels = 0;
Expand Down Expand Up @@ -180,6 +184,7 @@ class AudioStream : public ::AudioStream {
private:
inline void set(const ::AudioStream& stream) {
buffer = stream.buffer;
processor = stream.processor;
sampleRate = stream.sampleRate;
sampleSize = stream.sampleSize;
channels = stream.channels;
Expand Down
4 changes: 0 additions & 4 deletions include/Matrix.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,6 @@ class Matrix : public ::Matrix {
return ::MatrixInvert(*this);
}

inline Matrix Normalize() const {
return ::MatrixNormalize(*this);
}

static Matrix Identity() {
return ::MatrixIdentity();
}
Expand Down
7 changes: 0 additions & 7 deletions include/Model.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -111,13 +111,6 @@ class Model : public ::Model {
return *this;
}

/**
* Get collision info between ray and model
*/
inline RayCollision GetCollision(const ::Ray& ray) const {
return ::GetRayCollisionModel(ray, *this);
}

/**
* Update model animation pose
*/
Expand Down
7 changes: 0 additions & 7 deletions include/Ray.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,6 @@ class Ray : public ::Ray {
return GetRayCollisionBox(*this, box).hit;
}

/**
* Get collision info between ray and model
*/
inline RayCollision GetCollision(const ::Model& model) const {
return GetRayCollisionModel(*this, model);
}

/**
* Get collision information between ray and mesh
*/
Expand Down
7 changes: 0 additions & 7 deletions include/RayCollision.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,6 @@ class RayCollision : public ::RayCollision {
set(::GetRayCollisionMesh(ray, mesh, transform));
}

/**
* Get collision info between ray and model
*/
RayCollision(const ::Ray& ray, const ::Model& model) {
set(::GetRayCollisionModel(ray, model));
}

/**
* Get collision info between ray and triangle
*/
Expand Down