Merge remote-tracking branch 'refs/remotes/raysan5/develop' into newaudio

This commit is contained in:
Joshua Reisenauer
2016-05-12 16:06:22 -07:00
4 changed files with 124 additions and 145 deletions

View File

@@ -376,7 +376,7 @@ typedef struct Mesh {
float *tangents; // vertex tangents (XYZ - 3 components per vertex) (shader-location = 4)
unsigned char *colors; // vertex colors (RGBA - 4 components per vertex) (shader-location = 3)
unsigned short *indices; // vertex indices (in case vertex data comes indexed)
int triangleCount; // number of triangles to draw
int triangleCount; // number of triangles stored (indexed or not)
BoundingBox bounds; // mesh limits defined by min and max points