twix/raylib
1
0
Fork 0
mirror of https://github.com/raysan5/raylib.git synced 2026-02-07 22:59:17 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #224 from raysan5/develop

Browse Source 
Integrate develop branch
This commit is contained in:
Ray
2017-02-09 18:25:16 +01:00
committed by GitHub
parent 9492901133 42d5e3bd24
commit f8d94aeba5
11 changed files with 337 additions and 345 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/common/css/main.css
View File

@ -61,8 +61,10 @@ p a:hover{text-decoration: none; color:gray;}
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f5f5f5', endColorstr='#e0e0e0',GradientType=0 );
}
#social{ width:300px; height:50px; position:relative; float:right; margin-right:8px; margin-top:20px; margin-bottom:20px; }
#social{ width:372px; height:50px; position:relative; float:right; margin-right:8px; margin-top:20px; margin-bottom:20px; }
#social a:hover{ background-position: 0 -36px;}
#youtube{ width:36px; height:36px; float:left; position:relative; background-image: url(../img/icon_youtube.png); cursor: pointer; background-repeat:no-repeat; background-position: 0 0;}
#handmade{ width:36px; height:36px; float:left; position:relative; background-image: url(../img/icon_handmade.png); cursor: pointer; background-repeat:no-repeat; background-position: 0 0;}
#twitch{ width:36px; height:36px; float:left; position:relative; background-image: url(../img/icon_twitch.png); cursor: pointer; background-repeat:no-repeat; background-position: 0 0;}
#patreon{ width:36px; height:36px; float:left; position:relative; background-image: url(../img/icon_patreon.png); cursor: pointer; background-repeat:no-repeat; background-position: 0 0;}
#itchio{ width:36px; height:36px; float:left; position:relative; background-image: url(../img/icon_itchio.png); cursor: pointer; background-repeat:no-repeat; background-position: 0 0;}

BIN
docs/common/img/icon_handmade.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
docs/common/img/icon_youtube.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

2
docs/examples.html
View File

@ -41,6 +41,7 @@
<a id="logo" href="index.html"></a>
<div id="social">
<a id="itchio" href="https://raysan5.itch.io" target="_blank"></a>
<a id="handmade" href="https://raylib.handmade.network/" target="_blank"></a>
<a id="patreon" href="https://www.patreon.com/raysan5" target="_blank"></a>
<a id="twitch" href="http://www.twitch.tv/raysan5" target="_blank"></a>
<a id="reddit" href="https://www.reddit.com/r/raylib/" target="_blank"></a>
@ -48,6 +49,7 @@
<a id="facebook" href="http://www.facebook.com/raylibgames" target="_blank"></a>
<a id="twitter" href="http://www.twitter.com/raysan5" target="_blank"></a>
<a id="github" href="http://github.com/raysan5/raylib" target="_blank"></a>
<a id="youtube" href="https://www.youtube.com/channel/UC8WIBkhYb5sBNqXO1mZ7WSQ" target="_blank"></a>
</div>
<div class="menu">
<a href="index.html">about</a>

2
docs/games.html
View File

@ -41,6 +41,7 @@
<a id="logo" href="index.html"></a>
<div id="social">
<a id="itchio" href="https://raysan5.itch.io" target="_blank"></a>
<a id="handmade" href="https://raylib.handmade.network/" target="_blank"></a>
<a id="patreon" href="https://www.patreon.com/raysan5" target="_blank"></a>
<a id="twitch" href="http://www.twitch.tv/raysan5" target="_blank"></a>
<a id="reddit" href="https://www.reddit.com/r/raylib/" target="_blank"></a>
@ -48,6 +49,7 @@
<a id="facebook" href="http://www.facebook.com/raylibgames" target="_blank"></a>
<a id="twitter" href="http://www.twitter.com/raysan5" target="_blank"></a>
<a id="github" href="http://github.com/raysan5/raylib" target="_blank"></a>
<a id="youtube" href="https://www.youtube.com/channel/UC8WIBkhYb5sBNqXO1mZ7WSQ" target="_blank"></a>
</div>
<div class="menu">
<a href="index.html">about</a>

2
docs/helpme.html
View File

@ -32,6 +32,7 @@
<a id="logo" href="index.html"></a>
<div id="social">
<a id="itchio" href="https://raysan5.itch.io" target="_blank"></a>
<a id="handmade" href="https://raylib.handmade.network/" target="_blank"></a>
<a id="patreon" href="https://www.patreon.com/raysan5" target="_blank"></a>
<a id="twitch" href="http://www.twitch.tv/raysan5" target="_blank"></a>
<a id="reddit" href="https://www.reddit.com/r/raylib/" target="_blank"></a>
@ -39,6 +40,7 @@
<a id="facebook" href="http://www.facebook.com/raylibgames" target="_blank"></a>
<a id="twitter" href="http://www.twitter.com/raysan5" target="_blank"></a>
<a id="github" href="http://github.com/raysan5/raylib" target="_blank"></a>
<a id="youtube" href="https://www.youtube.com/channel/UC8WIBkhYb5sBNqXO1mZ7WSQ" target="_blank"></a>
</div>
<div class="menu">
<a href="index.html">about</a>

2
docs/index.html
View File

@ -60,6 +60,7 @@
<a id="logo" href="index.html"></a>
<div id="social">
<a id="itchio" href="https://raysan5.itch.io" target="_blank"></a>
<a id="handmade" href="https://raylib.handmade.network/" target="_blank"></a>
<a id="patreon" href="https://www.patreon.com/raysan5" target="_blank"></a>
<a id="twitch" href="http://www.twitch.tv/raysan5" target="_blank"></a>
<a id="reddit" href="https://www.reddit.com/r/raylib/" target="_blank"></a>
@ -67,6 +68,7 @@
<a id="facebook" href="http://www.facebook.com/raylibgames" target="_blank"></a>
<a id="twitter" href="http://www.twitter.com/raysan5" target="_blank"></a>
<a id="github" href="http://github.com/raysan5/raylib" target="_blank"></a>
<a id="youtube" href="https://www.youtube.com/channel/UC8WIBkhYb5sBNqXO1mZ7WSQ" target="_blank"></a>
</div>
<div class="menu">
<div id="active">about</div>

2
docs/license.html
View File

@ -32,6 +32,7 @@
<a id="logo" href="index.html"></a>
<div id="social">
<a id="itchio" href="https://raysan5.itch.io" target="_blank"></a>
<a id="handmade" href="https://raylib.handmade.network/" target="_blank"></a>
<a id="patreon" href="https://www.patreon.com/raysan5" target="_blank"></a>
<a id="twitch" href="http://www.twitch.tv/raysan5" target="_blank"></a>
<a id="reddit" href="https://www.reddit.com/r/raylib/" target="_blank"></a>
@ -39,6 +40,7 @@
<a id="facebook" href="http://www.facebook.com/raylibgames" target="_blank"></a>
<a id="twitter" href="http://www.twitter.com/raysan5" target="_blank"></a>
<a id="github" href="http://github.com/raysan5/raylib" target="_blank"></a>
<a id="youtube" href="https://www.youtube.com/channel/UC8WIBkhYb5sBNqXO1mZ7WSQ" target="_blank"></a>
</div>
<div class="menu">
<a href="index.html">about</a>

2
src/audio.c
View File

@ -859,7 +859,7 @@ void SetMusicPitch(Music music, float pitch)
// Set music loop count (loop repeats)
// NOTE: If set to -1, means infinite loop
void SetMusicLoopCount(Music music, float count);
void SetMusicLoopCount(Music music, float count)
{
music->loopCount = count;
}

2
src/audio.h
View File

@ -109,6 +109,7 @@ extern "C" { // Prevents name mangling of functions
void InitAudioDevice(void); // Initialize audio device and context
void CloseAudioDevice(void); // Close the audio device and context
bool IsAudioDeviceReady(void); // Check if audio device has been initialized successfully
void SetMasterVolume(float volume); // Set master volume (listener)
Wave LoadWave(const char *fileName); // Load wave data from file
Wave LoadWaveEx(void *data, int sampleCount, int sampleRate, int sampleSize, int channels); // Load wave data from raw array data
@ -138,6 +139,7 @@ void ResumeMusicStream(Music music); // Resume playin
bool IsMusicPlaying(Music music); // Check if music is playing
void SetMusicVolume(Music music, float volume); // Set volume for music (1.0 is max level)
void SetMusicPitch(Music music, float pitch); // Set pitch for a music (1.0 is base level)
void SetMusicLoopCount(Music music, float count); // Set music loop count (loop repeats)
float GetMusicTimeLength(Music music); // Get music time length (in seconds)
float GetMusicTimePlayed(Music music); // Get current music time played (in seconds)

22
src/rlgl.h
View File

@ -251,25 +251,6 @@ typedef unsigned char byte;
float fovy; // Camera field-of-view apperture in Y (degrees)
} Camera;
// Light type
typedef struct LightData {
unsigned int id; // Light unique id
bool enabled; // Light enabled
int type; // Light type: LIGHT_POINT, LIGHT_DIRECTIONAL, LIGHT_SPOT
Vector3 position; // Light position
Vector3 target; // Light target: LIGHT_DIRECTIONAL and LIGHT_SPOT (cone direction target)
float radius; // Light attenuation radius light intensity reduced with distance (world distance)
Color diffuse; // Light diffuse color
float intensity; // Light intensity level
float coneAngle; // Light cone max angle: LIGHT_SPOT
} LightData, *Light;
// Light types
typedef enum { LIGHT_POINT, LIGHT_DIRECTIONAL, LIGHT_SPOT } LightType;
// Texture parameters: filter mode
// NOTE 1: Filtering considers mipmaps if available in the texture
// NOTE 2: Filter is accordingly set for minification and magnification
@ -415,9 +396,6 @@ void EndShaderMode(void); // End custo
void BeginBlendMode(int mode); // Begin blending mode (alpha, additive, multiplied)
void EndBlendMode(void); // End blending mode (reset to default: alpha blending)
Light CreateLight(int type, Vector3 position, Color diffuse); // Create a new light, initialize it and add to pool
void DestroyLight(Light light); // Destroy a light and take it out of the list
void TraceLog(int msgType, const char *text, ...);
float *MatrixToFloat(Matrix mat);