diff options
| author | Ray <raysan5@gmail.com> | 2016-07-15 19:44:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-15 19:44:18 +0200 |
| commit | a2794379a0e1e2ab1486888aaa710f65d492e0fc (patch) | |
| tree | acd8185cf8574ccba8fab46ccdbca30f9a3cd895 /games | |
| parent | 1c98e6b698b8002e0c6c769c6d9f23a6e15f3bdf (diff) | |
| parent | fc19e24eba4358b3afb052f80425af4947b172d6 (diff) | |
| download | raylib-a2794379a0e1e2ab1486888aaa710f65d492e0fc.tar.gz raylib-a2794379a0e1e2ab1486888aaa710f65d492e0fc.zip | |
Merge pull request #132 from raysan5/develop
Develop branch integration
Diffstat (limited to 'games')
| -rw-r--r-- | games/raylib_demo/raylib_demo.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/games/raylib_demo/raylib_demo.c b/games/raylib_demo/raylib_demo.c index 7f6f291a..22213b46 100644 --- a/games/raylib_demo/raylib_demo.c +++ b/games/raylib_demo/raylib_demo.c @@ -202,8 +202,8 @@ int main() camera = (Camera){{ 0.0, 12.0, 15.0 }, { 0.0, 3.0, 0.0 }, { 0.0, 1.0, 0.0 }}; catTexture = LoadTexture("resources/catsham.png"); // Load model texture - cat = LoadModel("resources/cat.obj"); // Load OBJ model - SetModelTexture(&cat, catTexture); + cat = LoadModel("resources/cat.obj"); // Load OBJ model + cat.material.texDiffuse = texture; // Set cat model diffuse texture fxWav = LoadSound("resources/audio/weird.wav"); // Load WAV audio file fxOgg = LoadSound("resources/audio/tanatana.ogg"); // Load OGG audio file |