diff options
| author | Ray <raysan5@gmail.com> | 2017-01-22 15:31:56 +0100 |
|---|---|---|
| committer | Ray <raysan5@gmail.com> | 2017-01-22 15:31:56 +0100 |
| commit | f164ec80d6f1ca7afb7aec6a1e525cd67d401c14 (patch) | |
| tree | 3ada899b11950e42eca457d2f8673016365ae9a8 /examples | |
| parent | 7586031410c7c3746025ef6c8bc6bee4b73baf1f (diff) | |
| download | raylib-f164ec80d6f1ca7afb7aec6a1e525cd67d401c14.tar.gz raylib-f164ec80d6f1ca7afb7aec6a1e525cd67d401c14.zip | |
Upload wave collector - GGJ17 game
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/audio_sound_loading.c | 2 | ||||
| -rw-r--r-- | examples/resources/audio/sound.wav | bin | 0 -> 97512 bytes | |||
| -rw-r--r-- | examples/shaders_standard_lighting.c | 4 |
3 files changed, 4 insertions, 2 deletions
diff --git a/examples/audio_sound_loading.c b/examples/audio_sound_loading.c index f081e8ed..feb30563 100644 --- a/examples/audio_sound_loading.c +++ b/examples/audio_sound_loading.c @@ -24,7 +24,7 @@ int main() InitAudioDevice(); // Initialize audio device - Sound fxWav = LoadSound("resources/audio/weird.wav"); // Load WAV audio file + Sound fxWav = LoadSound("resources/audio/sound.wav"); // Load WAV audio file Sound fxOgg = LoadSound("resources/audio/tanatana.ogg"); // Load OGG audio file SetTargetFPS(60); diff --git a/examples/resources/audio/sound.wav b/examples/resources/audio/sound.wav Binary files differnew file mode 100644 index 00000000..b5d01c9b --- /dev/null +++ b/examples/resources/audio/sound.wav diff --git a/examples/shaders_standard_lighting.c b/examples/shaders_standard_lighting.c index e539ec47..728bdae0 100644 --- a/examples/shaders_standard_lighting.c +++ b/examples/shaders_standard_lighting.c @@ -35,7 +35,9 @@ int main() Model dwarf = LoadModel("resources/model/dwarf.obj"); // Load OBJ model - Material material = LoadStandardMaterial(); + Material material;// = LoadStandardMaterial(); + + material.shader = LoadShader("resources/shaders/glsl330/standard.vs", "resources/shaders/glsl330/standard.fs"); material.texDiffuse = LoadTexture("resources/model/dwarf_diffuse.png"); // Load model diffuse texture material.texNormal = LoadTexture("resources/model/dwarf_normal.png"); // Load model normal texture |