diff options
| author | raysan5 <[email protected]> | 2017-07-21 17:17:37 +0200 |
|---|---|---|
| committer | raysan5 <[email protected]> | 2017-07-21 17:17:37 +0200 |
| commit | 9040526f175ac6e19551fa72e2dc25790be9f818 (patch) | |
| tree | 891683ce3793d32a9d4d4e4ac84da68675023f87 /examples/models | |
| parent | 38d9fcb08ef81cd5a3ab93df825eac7714d03e45 (diff) | |
| download | raylib-9040526f175ac6e19551fa72e2dc25790be9f818.tar.gz raylib-9040526f175ac6e19551fa72e2dc25790be9f818.zip | |
Adapt to new materials system
Diffstat (limited to 'examples/models')
| -rw-r--r-- | examples/models/models_mesh_picking.c | 2 | ||||
| -rw-r--r-- | examples/models/models_obj_loading.c | 2 | ||||
| -rw-r--r-- | examples/models/models_skybox.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/examples/models/models_mesh_picking.c b/examples/models/models_mesh_picking.c index ec151599..2f54468a 100644 --- a/examples/models/models_mesh_picking.c +++ b/examples/models/models_mesh_picking.c @@ -35,7 +35,7 @@ int main() Model tower = LoadModel("resources/tower.obj"); // Load OBJ model Texture2D texture = LoadTexture("resources/tower.png"); // Load model texture - tower.material.texDiffuse = texture; // Set model diffuse texture + tower.material.maps[MAP_DIFFUSE].texture = texture; // Set model diffuse texture Vector3 towerPos = { 0.0f, 0.0f, 0.0f }; // Set model position BoundingBox towerBBox = CalculateBoundingBox(tower.mesh); diff --git a/examples/models/models_obj_loading.c b/examples/models/models_obj_loading.c index 50d42d2e..70f92168 100644 --- a/examples/models/models_obj_loading.c +++ b/examples/models/models_obj_loading.c @@ -25,7 +25,7 @@ int main() Model dwarf = LoadModel("resources/model/dwarf.obj"); // Load OBJ model Texture2D texture = LoadTexture("resources/model/dwarf_diffuse.png"); // Load model texture - dwarf.material.texDiffuse = texture; // Set dwarf model diffuse texture + dwarf.material.maps[MAP_DIFFUSE].texture = texture; // Set map diffuse texture Vector3 position = { 0.0f, 0.0f, 0.0f }; // Set model position SetTargetFPS(60); // Set our game to run at 60 frames-per-second diff --git a/examples/models/models_skybox.c b/examples/models/models_skybox.c index 500cb19b..25b01e9c 100644 --- a/examples/models/models_skybox.c +++ b/examples/models/models_skybox.c @@ -35,7 +35,7 @@ int main() // Load cubemap shader and setup required shader locations Shader shdrCubemap = LoadShader("resources/shaders/cubemap.vs", "resources/shaders/cubemap.fs"); - SetShaderValuei(shdrCubemap, GetShaderLocation(shdrCubemap, "environmentMap"), (int[1]){ 0 }, 1); + SetShaderValuei(shdrCubemap, GetShaderLocation(shdrCubemap, "equirectangularMap"), (int[1]){ 0 }, 1); Texture2D texHDR = LoadTexture("resources/pinetree.hdr"); skybox.material.maps[MAP_CUBEMAP].texture = GenTextureCubemap(shdrCubemap, texHDR, 512); |