diff options
| author | Ray <[email protected]> | 2016-12-22 11:47:59 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2016-12-22 11:47:59 +0100 |
| commit | 4419ee9802d7a45929fb4ecae2163d12fb44f2a7 (patch) | |
| tree | 54862a2fe85937766ca753e32a05642898ca6852 /src/raylib.h | |
| parent | 060d501cd1a8b591d38b3169ee98c416314261a7 (diff) | |
| parent | aaea2eb9a64ad97c54fe115f6fd132d6a00f76ef (diff) | |
| download | raylib-4419ee9802d7a45929fb4ecae2163d12fb44f2a7.tar.gz raylib-4419ee9802d7a45929fb4ecae2163d12fb44f2a7.zip | |
Merge pull request #210 from ficoos/fixes
Fixes
Diffstat (limited to 'src/raylib.h')
| -rw-r--r-- | src/raylib.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/raylib.h b/src/raylib.h index e7d2b74a..fff0c928 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -549,7 +549,7 @@ typedef enum { // Texture parameters: filter mode // NOTE 1: Filtering considers mipmaps if available in the texture // NOTE 2: Filter is accordingly set for minification and magnification -typedef enum { +typedef enum { FILTER_POINT = 0, // No filter, just pixel aproximation FILTER_BILINEAR, // Linear filtering FILTER_TRILINEAR, // Trilinear filtering (linear with mipmaps) @@ -581,12 +581,12 @@ typedef enum { } Gestures; // Camera system modes -typedef enum { - CAMERA_CUSTOM = 0, - CAMERA_FREE, - CAMERA_ORBITAL, - CAMERA_FIRST_PERSON, - CAMERA_THIRD_PERSON +typedef enum { + CAMERA_CUSTOM = 0, + CAMERA_FREE, + CAMERA_ORBITAL, + CAMERA_FIRST_PERSON, + CAMERA_THIRD_PERSON } CameraMode; // Head Mounted Display devices @@ -930,7 +930,8 @@ RLAPI Wave LoadWave(const char *fileName); // Load wa RLAPI Wave LoadWaveEx(float *data, int sampleCount, int sampleRate, int sampleSize, int channels); // Load wave data from float array data (32bit) RLAPI Sound LoadSound(const char *fileName); // Load sound to memory RLAPI Sound LoadSoundFromWave(Wave wave); // Load sound to memory from wave data -RLAPI void UpdateSound(Sound sound, void *data, int numSamples); // Update sound buffer with new data +RLAPI void UpdateSound(Sound sound, const void *data, int numSamples);// Update sound buffer with new data +RLAPI Sound LoadSoundFromRES(const char *rresName, int resId); // Load sound to memory from rRES file (raylib Resource) RLAPI void UnloadWave(Wave wave); // Unload wave data RLAPI void UnloadSound(Sound sound); // Unload sound RLAPI void PlaySound(Sound sound); // Play a sound |
