diff --git a/examples/models/models_loading_gltf.c b/examples/models/models_loading_gltf.c
index 15138e388..364006750 100644
--- a/examples/models/models_loading_gltf.c
+++ b/examples/models/models_loading_gltf.c
@@ -1,25 +1,16 @@
/*******************************************************************************************
*
-* raylib [models] example - Load models gltf
+* raylib [models] example - loading gltf
*
-* This example has been created using raylib 3.5 (www.raylib.com)
+* This example has been created using raylib 4.2 (www.raylib.com)
* raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details)
*
-* NOTE: To export a model from Blender, make sure it is not posed, the vertices need to be
-* in the same position as they would be in edit mode.
-* Also make sure the scale parameter of your models is set to 0.0,
-* scaling can be applied from the export menu.
-*
-* Example contributed by Hristo Stamenov (@object71) and reviewed by Ramon Santamaria (@raysan5)
-*
-* Copyright (c) 2021 Hristo Stamenov (@object71) and Ramon Santamaria (@raysan5)
+* Copyright (c) 2022 Ramon Santamaria (@raysan5)
*
********************************************************************************************/
#include "raylib.h"
-#define MAX_GLTF_MODELS 8
-
//------------------------------------------------------------------------------------
// Program main entry point
//------------------------------------------------------------------------------------
@@ -30,7 +21,7 @@ int main(void)
const int screenWidth = 800;
const int screenHeight = 450;
- InitWindow(screenWidth, screenHeight, "raylib [models] example - model");
+ InitWindow(screenWidth, screenHeight, "raylib [models] example - loading gltf");
// Define the camera to look into our 3d world
Camera camera = { 0 };
@@ -40,18 +31,8 @@ int main(void)
camera.fovy = 45.0f; // Camera field-of-view Y
camera.projection = CAMERA_PERSPECTIVE; // Camera mode type
- // Load some models
- Model model[MAX_GLTF_MODELS] = { 0 };
- model[0] = LoadModel("resources/models/gltf/raylib_32x32.glb");
- model[1] = LoadModel("resources/models/gltf/rigged_figure.glb");
- model[2] = LoadModel("resources/models/gltf/GearboxAssy.glb");
- model[3] = LoadModel("resources/models/gltf/BoxAnimated.glb");
- model[4] = LoadModel("resources/models/gltf/AnimatedTriangle.gltf");
- model[5] = LoadModel("resources/models/gltf/AnimatedMorphCube.glb");
- model[6] = LoadModel("resources/models/gltf/vertex_colored_object.glb");
- model[7] = LoadModel("resources/models/gltf/girl.glb");
-
- int currentModel = 0;
+ // Loaf gltf model
+ Model model = LoadModel("resources/models/gltf/robot.glb");
Vector3 position = { 0.0f, 0.0f, 0.0f }; // Set model position
@@ -66,18 +47,6 @@ int main(void)
// Update
//----------------------------------------------------------------------------------
UpdateCamera(&camera); // Update our camera with inputs
-
- if (IsKeyReleased(KEY_RIGHT))
- {
- currentModel++;
- if (currentModel == MAX_GLTF_MODELS) currentModel = 0;
- }
-
- if (IsKeyReleased(KEY_LEFT))
- {
- currentModel--;
- if (currentModel < 0) currentModel = MAX_GLTF_MODELS - 1;
- }
//----------------------------------------------------------------------------------
// Draw
@@ -88,7 +57,7 @@ int main(void)
BeginMode3D(camera);
- DrawModel(model[currentModel], position, 1.0f, WHITE);
+ DrawModel(model, position, 1.0f, WHITE);
DrawGrid(10, 1.0f); // Draw a grid
EndMode3D();
@@ -99,8 +68,8 @@ int main(void)
// De-Initialization
//--------------------------------------------------------------------------------------
- for (int i = 0; i < MAX_GLTF_MODELS; i++) UnloadModel(model[i]); // Unload models
-
+ UnloadModel(model); // Unload model and meshes/material
+
CloseWindow(); // Close window and OpenGL context
//--------------------------------------------------------------------------------------
diff --git a/examples/models/resources/LICENSE.md b/examples/models/resources/LICENSE.md
index 6fdeaa5a2..d7f85c0f4 100644
--- a/examples/models/resources/LICENSE.md
+++ b/examples/models/resources/LICENSE.md
@@ -1,16 +1,15 @@
| resource | author | licence | notes |
| :------------------- | :---------: | :------ | :---- |
-| models/obj/castle.obj,
models/castle_diffuse.png | [Alberto Cano](https://www.artstation.com/albertocano) | [CC-BY-NC](https://creativecommons.org/licenses/by-nc/4.0/legalcode) | - |
-| models/obj/bridge.obj,
models/bridge_diffuse.png | [Alberto Cano](https://www.artstation.com/albertocano) | [CC-BY-NC](https://creativecommons.org/licenses/by-nc/4.0/legalcode) | - |
-| models/obj/house.obj,
models/house_diffuse.png | [Alberto Cano](https://www.artstation.com/albertocano) | [CC-BY-NC](https://creativecommons.org/licenses/by-nc/4.0/legalcode) | - |
-| models/obj/market.obj,
models/market_diffuse.png | [Alberto Cano](https://www.artstation.com/albertocano) | [CC-BY-NC](https://creativecommons.org/licenses/by-nc/4.0/legalcode) | - |
-| models/obj/turret.obj,
models/turret_diffuse.png | [Alberto Cano](https://www.artstation.com/albertocano) | [CC-BY-NC](https://creativecommons.org/licenses/by-nc/4.0/legalcode) | - |
-| models/obj/well.obj,
models/well_diffuse.png | [Alberto Cano](https://www.artstation.com/albertocano) | [CC-BY-NC](https://creativecommons.org/licenses/by-nc/4.0/legalcode) | - |
-| models/obj/cube.obj,
models/cube_diffuse.png | [@raysan5](https://github.com/raysan5) | [CC0](https://creativecommons.org/publicdomain/zero/1.0/) | - |
-| models/obj/plane.gltf,
models/gltf/plane/plane.bin,
models/gltf/plane/plane_diffuse.png | [GiaHanLam](https://sketchfab.com/GiaHanLam) | [CC-BY](https://creativecommons.org/licenses/by/4.0/) | Used by: [`models_yaw_pitch_roll.c`](https://github.com/raysan5/raylib/blob/master/examples/models/models_yaw_pitch_roll.c)
+| models/obj/castle.obj,
models/obj/castle_diffuse.png | [Alberto Cano](https://www.artstation.com/albertocano) | [CC-BY-NC](https://creativecommons.org/licenses/by-nc/4.0/legalcode) | - |
+| models/obj/bridge.obj,
models/obj/bridge_diffuse.png | [Alberto Cano](https://www.artstation.com/albertocano) | [CC-BY-NC](https://creativecommons.org/licenses/by-nc/4.0/legalcode) | - |
+| models/obj/house.obj,
models/obj/house_diffuse.png | [Alberto Cano](https://www.artstation.com/albertocano) | [CC-BY-NC](https://creativecommons.org/licenses/by-nc/4.0/legalcode) | - |
+| models/obj/market.obj,
models/obj/market_diffuse.png | [Alberto Cano](https://www.artstation.com/albertocano) | [CC-BY-NC](https://creativecommons.org/licenses/by-nc/4.0/legalcode) | - |
+| models/obj/turret.obj,
models/obj/turret_diffuse.png | [Alberto Cano](https://www.artstation.com/albertocano) | [CC-BY-NC](https://creativecommons.org/licenses/by-nc/4.0/legalcode) | - |
+| models/obj/well.obj,
models/obj/well_diffuse.png | [Alberto Cano](https://www.artstation.com/albertocano) | [CC-BY-NC](https://creativecommons.org/licenses/by-nc/4.0/legalcode) | - |
+| models/obj/cube.obj,
models/obj/cube_diffuse.png | [@raysan5](https://github.com/raysan5) | [CC0](https://creativecommons.org/publicdomain/zero/1.0/) | - |
+| models/obj/plane.obj,
models/obj/plane_diffuse.png | [GiaHanLam](https://sketchfab.com/GiaHanLam) | [CC-BY](https://creativecommons.org/licenses/by/4.0/) | Used by: [`models_yaw_pitch_roll.c`](https://github.com/raysan5/raylib/blob/master/examples/models/models_yaw_pitch_roll.c)
| models/iqm/guy.iqm,
models/iqm/guyanim.iqm,
models/iqm/guytex.png,
models/iqm/guy.blend | [@culacant](https://github.com/culacant) | [CC0](https://creativecommons.org/publicdomain/zero/1.0/) | - |
-| models/iqm/vertex_colored_object.iqm | ❔ | ❔ | - |
-| models/gltf/... | _various_ | Check [LICENSE](https://github.com/raysan5/raylib/blob/master/examples/models/resources/models/gltf/LICENSE) | - |
+| models/gltf/robot.glb,
models/gltf/robot.blend | [CC0](https://creativecommons.org/publicdomain/zero/1.0/) | - |
| models/vox/chr_knight.vox | ❔ | ❔ | - |
| models/vox/chr_sword.vox | ❔ | ❔ | - |
| models/vox/monu9.vox | ❔ | ❔ | - |
diff --git a/examples/models/resources/models/gltf/AnimatedMorphCube.glb b/examples/models/resources/models/gltf/AnimatedMorphCube.glb
deleted file mode 100644
index 219d2ac52..000000000
Binary files a/examples/models/resources/models/gltf/AnimatedMorphCube.glb and /dev/null differ
diff --git a/examples/models/resources/models/gltf/AnimatedTriangle.gltf b/examples/models/resources/models/gltf/AnimatedTriangle.gltf
deleted file mode 100644
index d5c095492..000000000
--- a/examples/models/resources/models/gltf/AnimatedTriangle.gltf
+++ /dev/null
@@ -1,118 +0,0 @@
-{
- "scene" : 0,
- "scenes" : [
- {
- "nodes" : [ 0 ]
- }
- ],
-
- "nodes" : [
- {
- "mesh" : 0,
- "rotation" : [ 0.0, 0.0, 0.0, 1.0 ]
- }
- ],
-
- "meshes" : [
- {
- "primitives" : [ {
- "attributes" : {
- "POSITION" : 1
- },
- "indices" : 0
- } ]
- }
- ],
-
- "animations": [
- {
- "samplers" : [
- {
- "input" : 2,
- "interpolation" : "LINEAR",
- "output" : 3
- }
- ],
- "channels" : [ {
- "sampler" : 0,
- "target" : {
- "node" : 0,
- "path" : "rotation"
- }
- } ]
- }
- ],
-
- "buffers" : [
- {
- "uri" : "data:application/octet-stream;base64,AAABAAIAAAAAAAAAAAAAAAAAAAAAAIA/AAAAAAAAAAAAAAAAAACAPwAAAAA=",
- "byteLength" : 44
- },
- {
- "uri" : "data:application/octet-stream;base64,AAAAAAAAgD4AAAA/AABAPwAAgD8AAAAAAAAAAAAAAAAAAIA/AAAAAAAAAAD0/TQ/9P00PwAAAAAAAAAAAACAPwAAAAAAAAAAAAAAAPT9ND/0/TS/AAAAAAAAAAAAAAAAAACAPw==",
- "byteLength" : 100
- }
- ],
- "bufferViews" : [
- {
- "buffer" : 0,
- "byteOffset" : 0,
- "byteLength" : 6,
- "target" : 34963
- },
- {
- "buffer" : 0,
- "byteOffset" : 8,
- "byteLength" : 36,
- "target" : 34962
- },
- {
- "buffer" : 1,
- "byteOffset" : 0,
- "byteLength" : 100
- }
- ],
- "accessors" : [
- {
- "bufferView" : 0,
- "byteOffset" : 0,
- "componentType" : 5123,
- "count" : 3,
- "type" : "SCALAR",
- "max" : [ 2 ],
- "min" : [ 0 ]
- },
- {
- "bufferView" : 1,
- "byteOffset" : 0,
- "componentType" : 5126,
- "count" : 3,
- "type" : "VEC3",
- "max" : [ 1.0, 1.0, 0.0 ],
- "min" : [ 0.0, 0.0, 0.0 ]
- },
- {
- "bufferView" : 2,
- "byteOffset" : 0,
- "componentType" : 5126,
- "count" : 5,
- "type" : "SCALAR",
- "max" : [ 1.0 ],
- "min" : [ 0.0 ]
- },
- {
- "bufferView" : 2,
- "byteOffset" : 20,
- "componentType" : 5126,
- "count" : 5,
- "type" : "VEC4",
- "max" : [ 0.0, 0.0, 1.0, 1.0 ],
- "min" : [ 0.0, 0.0, 0.0, -0.707 ]
- }
- ],
-
- "asset" : {
- "version" : "2.0"
- }
-
-}
\ No newline at end of file
diff --git a/examples/models/resources/models/gltf/BoxAnimated.glb b/examples/models/resources/models/gltf/BoxAnimated.glb
deleted file mode 100644
index 69481ec3c..000000000
Binary files a/examples/models/resources/models/gltf/BoxAnimated.glb and /dev/null differ
diff --git a/examples/models/resources/models/gltf/LICENSE b/examples/models/resources/models/gltf/LICENSE
index 305079cfb..3c9a38dee 100644
--- a/examples/models/resources/models/gltf/LICENSE
+++ b/examples/models/resources/models/gltf/LICENSE
@@ -1,23 +1,2 @@
-Rigged Figure model has been created by Cesium (https://cesium.com/cesiumjs/),
-and licensed as Creative Commons Attribution 4.0 International License.
-
-Box Animated model has been created by Cesium (https://cesium.com/cesiumjs/)
-and is licensed as Creative Commons Attribution 4.0 International License
-
-Avocado model is provided by Microsoft
-and licensed as CC0 Universal Public Domain
-
-Animated Morph Cube model is provided by Microsoft
-and licensed as CC0 Universal Public Domain
-
-Animated Triangle model is licensed as CC0 Universal Public Domain
-
-Gearbox Assy model has been provided by Okino Computer Graphics, using Okino Polytrans Software.
-no license information was provided
-
-Girl model has been provided by Hristo Stamenov (https://thatonegamedev.com/)
-and licensed as CC0 Universal Public Domain
-
-Check for details on CC0: https://creativecommons.org/publicdomain/zero/1.0/
-Check for details on CC4: http://creativecommons.org/licenses/by/4.0/
-GLTF sample models for testing are taken from: https://github.com/KhronosGroup/glTF-Sample-Models/
+robot.glb model by @Quaternius (https://www.patreon.com/quaternius)
+Licensed under CC0 1.0 Universal (CC0 1.0) - Public Domain Dedication (https://creativecommons.org/publicdomain/zero/1.0/)
\ No newline at end of file
diff --git a/examples/models/resources/models/gltf/girl.glb b/examples/models/resources/models/gltf/girl.glb
deleted file mode 100644
index c368590c8..000000000
Binary files a/examples/models/resources/models/gltf/girl.glb and /dev/null differ
diff --git a/examples/models/resources/models/gltf/raylib_32x32.glb b/examples/models/resources/models/gltf/raylib_logo_3d.glb
similarity index 100%
rename from examples/models/resources/models/gltf/raylib_32x32.glb
rename to examples/models/resources/models/gltf/raylib_logo_3d.glb
diff --git a/examples/models/resources/models/gltf/rigged_figure.glb b/examples/models/resources/models/gltf/rigged_figure.glb
deleted file mode 100644
index c505a33df..000000000
Binary files a/examples/models/resources/models/gltf/rigged_figure.glb and /dev/null differ
diff --git a/examples/models/resources/models/gltf/robot.blend b/examples/models/resources/models/gltf/robot.blend
new file mode 100644
index 000000000..d3bdac237
Binary files /dev/null and b/examples/models/resources/models/gltf/robot.blend differ
diff --git a/examples/models/resources/models/gltf/robot.glb b/examples/models/resources/models/gltf/robot.glb
new file mode 100644
index 000000000..73f5bf44e
Binary files /dev/null and b/examples/models/resources/models/gltf/robot.glb differ
diff --git a/examples/models/resources/models/gltf/vertex_colored_object.glb b/examples/models/resources/models/gltf/vertex_colored_object.glb
deleted file mode 100644
index 0b57eddbd..000000000
Binary files a/examples/models/resources/models/gltf/vertex_colored_object.glb and /dev/null differ
diff --git a/examples/models/resources/models/iqm/vertex_colored_object.iqm b/examples/models/resources/models/iqm/vertex_colored_object.iqm
deleted file mode 100644
index ad0db07eb..000000000
Binary files a/examples/models/resources/models/iqm/vertex_colored_object.iqm and /dev/null differ