Parcourir la source

REVIEWED: models resources structure

pull/2050/head
raysan5 il y a 3 ans
Parent
révision
599d6e810f
37 fichiers modifiés avec 15 ajouts et 29508 suppressions
  1. +15
    -12
      examples/models/resources/LICENSE.md
  2. +0
    -1725
      examples/models/resources/models/bridge.obj
  3. BIN
      examples/models/resources/models/bridge_diffuse.png
  4. +0
    -12919
      examples/models/resources/models/castle.obj
  5. BIN
      examples/models/resources/models/castle_diffuse.png
  6. +0
    -68
      examples/models/resources/models/cube.obj
  7. BIN
      examples/models/resources/models/cube_diffuse.png
  8. +0
    -0
      examples/models/resources/models/gltf/AnimatedMorphCube.glb
  9. +0
    -0
      examples/models/resources/models/gltf/AnimatedTriangle.gltf
  10. +0
    -0
      examples/models/resources/models/gltf/BoxAnimated.glb
  11. +0
    -0
      examples/models/resources/models/gltf/GearboxAssy.glb
  12. +0
    -0
      examples/models/resources/models/gltf/LICENSE
  13. +0
    -0
      examples/models/resources/models/gltf/girl.glb
  14. +0
    -0
      examples/models/resources/models/gltf/plane/LICENSE
  15. +0
    -0
      examples/models/resources/models/gltf/plane/plane.bin
  16. +0
    -0
      examples/models/resources/models/gltf/plane/plane.gltf
  17. +0
    -0
      examples/models/resources/models/gltf/plane/plane_diffuse.png
  18. +0
    -0
      examples/models/resources/models/gltf/raylib_32x32.glb
  19. +0
    -0
      examples/models/resources/models/gltf/rigged_figure.glb
  20. +0
    -0
      examples/models/resources/models/gltf/vertex_colored_object.glb
  21. +0
    -4564
      examples/models/resources/models/house.obj
  22. BIN
      examples/models/resources/models/house_diffuse.png
  23. +0
    -0
      examples/models/resources/models/iqm/guy.blend
  24. +0
    -0
      examples/models/resources/models/iqm/guy.iqm
  25. +0
    -0
      examples/models/resources/models/iqm/guyanim.iqm
  26. +0
    -0
      examples/models/resources/models/iqm/guytex.png
  27. +0
    -0
      examples/models/resources/models/iqm/vertex_colored_object.iqm
  28. +0
    -7301
      examples/models/resources/models/market.obj
  29. BIN
      examples/models/resources/models/market_diffuse.png
  30. +0
    -1888
      examples/models/resources/models/turret.obj
  31. BIN
      examples/models/resources/models/turret_diffuse.png
  32. +0
    -0
      examples/models/resources/models/vox/chr_knight.vox
  33. +0
    -0
      examples/models/resources/models/vox/chr_sword.vox
  34. +0
    -0
      examples/models/resources/models/vox/monu9.vox
  35. +0
    -1030
      examples/models/resources/models/well.obj
  36. BIN
      examples/models/resources/models/well_diffuse.png
  37. +0
    -1
      src/raymath.h

+ 15
- 12
examples/models/resources/LICENSE.md Voir le fichier

@ -1,20 +1,23 @@
| resource | author | licence | notes |
| :------------------- | :---------: | :------ | :---- |
| models/castle.obj,<br> models/castle_diffuse.png | [Alberto Cano](https://www.artstation.com/albertocano) | [CC-BY-NC](https://creativecommons.org/licenses/by-nc/4.0/legalcode) | - |
| models/bridge.obj,<br> models/bridge_diffuse.png | [Alberto Cano](https://www.artstation.com/albertocano) | [CC-BY-NC](https://creativecommons.org/licenses/by-nc/4.0/legalcode) | - |
| models/house.obj,<br> models/house_diffuse.png | [Alberto Cano](https://www.artstation.com/albertocano) | [CC-BY-NC](https://creativecommons.org/licenses/by-nc/4.0/legalcode) | - |
| models/market.obj,<br> models/market_diffuse.png | [Alberto Cano](https://www.artstation.com/albertocano) | [CC-BY-NC](https://creativecommons.org/licenses/by-nc/4.0/legalcode) | - |
| models/turret.obj,<br> models/turret_diffuse.png | [Alberto Cano](https://www.artstation.com/albertocano) | [CC-BY-NC](https://creativecommons.org/licenses/by-nc/4.0/legalcode) | - |
| models/well.obj,<br> models/well_diffuse.png | [Alberto Cano](https://www.artstation.com/albertocano) | [CC-BY-NC](https://creativecommons.org/licenses/by-nc/4.0/legalcode) | - |
| models/cube.obj,<br> models/cube_diffuse.png | [@raysan5](https://github.com/raysan5) | [CC0](https://creativecommons.org/publicdomain/zero/1.0/) | - |
| models/vertex_colored_object.iqm | ❔ | ❔ | - |
| models/obj/castle.obj,<br>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,<br>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,<br>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,<br>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,<br>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,<br>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,<br>models/cube_diffuse.png | [@raysan5](https://github.com/raysan5) | [CC0](https://creativecommons.org/publicdomain/zero/1.0/) | - |
| models/iqm/guy.iqm,<br>models/iqm/guyanim.iqm,<br>models/iqm/guytex.png,<br>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/plane/plane.gltf,<br>models/gltf/plane/plane.bin,<br>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/gltf/... | _various_ | Check [LICENSE](https://github.com/raysan5/raylib/blob/master/examples/models/resources/models/gltf/LICENSE) | - |
| models/vox/chr_knight.vox | ❔ | ❔ | - |
| models/vox/chr_sword.vox | ❔ | ❔ | - |
| models/vox/monu9.vox | ❔ | ❔ | - |
| billboard.png | [@emegeme](https://github.com/emegeme) | [CC0](https://creativecommons.org/publicdomain/zero/1.0/) | - |
| cubicmap.png | [@raysan5](https://github.com/raysan5) | [CC0](https://creativecommons.org/publicdomain/zero/1.0/) | - |
| cubicmap_atlas.png | [@emegeme](https://github.com/emegeme) | [CC0](https://creativecommons.org/publicdomain/zero/1.0/) | - |
| heightmap.png | [@raysan5](https://github.com/raysan5) | [CC0](https://creativecommons.org/publicdomain/zero/1.0/) | - |
| dresden_square_1k.hdr | [HDRIHaven](https://hdrihaven.com/hdri/?h=dresden_square) | [CC0](https://hdrihaven.com/p/license.php) | - |
| dresden_square_2k.hdr | [HDRIHaven](https://hdrihaven.com/hdri/?h=dresden_square) | [CC0](https://hdrihaven.com/p/license.php) | - |
| skybox.png | ❔ | ❔ | - |
| **guy/...** | [@culacant](https://github.com/culacant) | [CC0](https://creativecommons.org/publicdomain/zero/1.0/) |
| **plane/...** | [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)
| **gltf/...** | _various_ | [LICENSE](https://github.com/raysan5/raylib/blob/master/examples/models/resources/gltf/LICENSE) | - |
| skybox.png | ❔ | ❔ | - |

+ 0
- 1725
examples/models/resources/models/bridge.obj
Fichier diff supprimé car celui-ci est trop grand
Voir le fichier


BIN
examples/models/resources/models/bridge_diffuse.png Voir le fichier

Avant Après
Largeur: 1024  |  Hauteur: 1024  |  Taille: 311 KiB

+ 0
- 12919
examples/models/resources/models/castle.obj
Fichier diff supprimé car celui-ci est trop grand
Voir le fichier


BIN
examples/models/resources/models/castle_diffuse.png Voir le fichier

Avant Après
Largeur: 1024  |  Hauteur: 1024  |  Taille: 434 KiB

+ 0
- 68
examples/models/resources/models/cube.obj Voir le fichier

@ -1,68 +0,0 @@
# reference material
#mtllib cube.mtl
# object box
# vertex (XZY)
v 5.5 0 1.5
v 8.5 0 1.5
v 5.5 0 -1.5
v 8.5 0 -1.5
v 5.5 3 1.5
v 8.5 3 1.5
v 5.5 3 -1.5
v 8.5 3 -1.5
# normals (XYZ)
vn 0 -1 0
vn 0 1 0
vn 0 0 1
vn 1 0 0
vn 0 0 -1
vn -1 0 0
# UVs (XY)
vt 0.5 0 0
vt 1 0 0
vt 1 0.5 0
vt 0.5 0.5 0
vt 0.5 0.5 0
vt 1 0.5 0
vt 0.5 1 0
vt 1 1 0
vt 0 0.5 0
vt 1 0.5 0
vt 1 0 0
vt 0 0 0
vt 0 0.5 0
vt 1 0.5 0
vt 1 1 0
vt 0 1 0
vt 0.5 0 0
vt 0 0 0
vt 0 0.5 0
vt 0.5 0.5 0
vt 0 0.5 0
vt 0.5 0.5 0
vt 0.5 1 0
vt 0 1 0
# merger
g box
# reference material
#usemtl mat01
# faces
f 1/9/1 3/10/1 4/11/1
f 4/11/1 2/12/1 1/9/1
f 5/13/2 6/14/2 8/15/2
f 8/15/2 7/16/2 5/13/2
f 1/17/6 2/18/6 6/19/6
f 6/19/6 5/20/6 1/17/6
f 2/6/1 4/5/1 8/7/1
f 8/7/1 6/8/1 2/6/1
f 4/2/3 3/1/3 7/4/3
f 7/4/3 8/3/3 4/2/3
f 3/22/5 1/21/5 5/24/5
f 5/24/5 7/23/5 3/22/5

BIN
examples/models/resources/models/cube_diffuse.png Voir le fichier

Avant Après
Largeur: 256  |  Hauteur: 256  |  Taille: 23 KiB

examples/models/resources/gltf/AnimatedMorphCube.glb → examples/models/resources/models/gltf/AnimatedMorphCube.glb Voir le fichier


examples/models/resources/gltf/AnimatedTriangle.gltf → examples/models/resources/models/gltf/AnimatedTriangle.gltf Voir le fichier


examples/models/resources/gltf/BoxAnimated.glb → examples/models/resources/models/gltf/BoxAnimated.glb Voir le fichier


examples/models/resources/gltf/GearboxAssy.glb → examples/models/resources/models/gltf/GearboxAssy.glb Voir le fichier


examples/models/resources/gltf/LICENSE → examples/models/resources/models/gltf/LICENSE Voir le fichier


examples/models/resources/gltf/girl.glb → examples/models/resources/models/gltf/girl.glb Voir le fichier


examples/models/resources/plane/LICENSE → examples/models/resources/models/gltf/plane/LICENSE Voir le fichier


examples/models/resources/plane/plane.bin → examples/models/resources/models/gltf/plane/plane.bin Voir le fichier


examples/models/resources/plane/plane.gltf → examples/models/resources/models/gltf/plane/plane.gltf Voir le fichier


examples/models/resources/plane/plane_diffuse.png → examples/models/resources/models/gltf/plane/plane_diffuse.png Voir le fichier


examples/models/resources/gltf/raylib_32x32.glb → examples/models/resources/models/gltf/raylib_32x32.glb Voir le fichier


examples/models/resources/gltf/rigged_figure.glb → examples/models/resources/models/gltf/rigged_figure.glb Voir le fichier


examples/models/resources/gltf/vertex_colored_object.glb → examples/models/resources/models/gltf/vertex_colored_object.glb Voir le fichier


+ 0
- 4564
examples/models/resources/models/house.obj
Fichier diff supprimé car celui-ci est trop grand
Voir le fichier


BIN
examples/models/resources/models/house_diffuse.png Voir le fichier

Avant Après
Largeur: 1024  |  Hauteur: 1024  |  Taille: 383 KiB

examples/models/resources/guy/guy.blend → examples/models/resources/models/iqm/guy.blend Voir le fichier


examples/models/resources/guy/guy.iqm → examples/models/resources/models/iqm/guy.iqm Voir le fichier


examples/models/resources/guy/guyanim.iqm → examples/models/resources/models/iqm/guyanim.iqm Voir le fichier


examples/models/resources/guy/guytex.png → examples/models/resources/models/iqm/guytex.png Voir le fichier


examples/models/resources/models/vertex_colored_object.iqm → examples/models/resources/models/iqm/vertex_colored_object.iqm Voir le fichier


+ 0
- 7301
examples/models/resources/models/market.obj
Fichier diff supprimé car celui-ci est trop grand
Voir le fichier


BIN
examples/models/resources/models/market_diffuse.png Voir le fichier

Avant Après
Largeur: 1024  |  Hauteur: 1024  |  Taille: 380 KiB

+ 0
- 1888
examples/models/resources/models/turret.obj
Fichier diff supprimé car celui-ci est trop grand
Voir le fichier


BIN
examples/models/resources/models/turret_diffuse.png Voir le fichier

Avant Après
Largeur: 1024  |  Hauteur: 1024  |  Taille: 371 KiB

examples/models/resources/vox/chr_knight.vox → examples/models/resources/models/vox/chr_knight.vox Voir le fichier


examples/models/resources/vox/chr_sword.vox → examples/models/resources/models/vox/chr_sword.vox Voir le fichier


examples/models/resources/vox/monu9.vox → examples/models/resources/models/vox/monu9.vox Voir le fichier


+ 0
- 1030
examples/models/resources/models/well.obj
Fichier diff supprimé car celui-ci est trop grand
Voir le fichier


BIN
examples/models/resources/models/well_diffuse.png Voir le fichier

Avant Après
Largeur: 1024  |  Hauteur: 1024  |  Taille: 334 KiB

+ 0
- 1
src/raymath.h Voir le fichier

@ -69,7 +69,6 @@
#define RMAPI inline // Functions may be inlined or external definition used
#endif
#endif
//----------------------------------------------------------------------------------
// Defines and Macros

||||||
x
 
000:0
Chargement…
Annuler
Enregistrer