MrMonopoly/raylib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 6577aa890e into 53056f3e7e

Browse Source
This commit is contained in:
Onix 2016-08-11 18:23:36 +00:00 committed by GitHub
commit 8fcdff7be2
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
games/raylib_demo/raylib_demo.c
View File

@ -203,7 +203,7 @@ int main()
catTexture = LoadTexture("resources/catsham.png"); // Load model texture catTexture = LoadTexture("resources/catsham.png"); // Load model texture
cat = LoadModel("resources/cat.obj"); // Load OBJ model cat = LoadModel("resources/cat.obj"); // Load OBJ model
cat.material.texDiffuse = texture; // Set cat model diffuse texture cat.material.texDiffuse = catTexture; // Set cat model diffuse texture
fxWav = LoadSound("resources/audio/weird.wav"); // Load WAV audio file fxWav = LoadSound("resources/audio/weird.wav"); // Load WAV audio file
fxOgg = LoadSound("resources/audio/tanatana.ogg"); // Load OGG audio file fxOgg = LoadSound("resources/audio/tanatana.ogg"); // Load OGG audio file
@ -464,11 +464,11 @@ void UpdateDrawOneFrame(void)
if (selectedModule == AUDIO) if (selectedModule == AUDIO)
{ {
if (IsKeyPressed(KEY_SPACE) && !MusicIsPlaying()) PlayMusicStream("resources/audio/guitar_noodling.ogg"); // Play music stream if (IsKeyPressed(KEY_SPACE) && !MusicIsPlaying()) PlayMusicStream(1,"resources/audio/guitar_noodling.ogg"); // Play music stream
if (IsKeyPressed('S')) if (IsKeyPressed('S'))
{ {
StopMusicStream(); StopMusicStream(1);
timePlayed = 0.0f; timePlayed = 0.0f;
for (int i = 0; i < MAX_BALLS; i++) for (int i = 0; i < MAX_BALLS; i++)
@ -484,7 +484,7 @@ void UpdateDrawOneFrame(void)
if (MusicIsPlaying()) if (MusicIsPlaying())
{ {
timePlayed = GetMusicTimePlayed() / GetMusicTimeLength() * 100 * 4; timePlayed = GetMusicTimePlayed(1) / GetMusicTimeLength(11) * 100 * 4;
if ((framesCounter%10) == 0) if ((framesCounter%10) == 0)
{ {

6
src/Makefile
View File

@ -222,10 +222,10 @@ ifeq ($(ROOT),root)
# /usr/local/include/) are for libraries that are installed # /usr/local/include/) are for libraries that are installed
# manually (without a package manager). # manually (without a package manager).
ifeq ($(SHARED),YES) ifeq ($(SHARED),YES)
cp --update libraylib.so /usr/local/lib/libraylib.so cp --update ~/raylib/release/linux/libraylib.so /usr/local/lib/libraylib.so
else else
cp --update raylib.h /usr/local/include/raylib.h cp --update ~/raylib/release/linux/raylib.h /usr/local/include/raylib.h
cp --update libraylib.a /usr/local/lib/libraylib.a cp --update ~/raylib/release/linux/libraylib.a /usr/local/lib/libraylib.a
endif endif
@echo "raylib dev files installed/updated!" @echo "raylib dev files installed/updated!"
else else