summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--src/models.c5
-rw-r--r--src/raylib.h2
-rw-r--r--src/rlgl.h2
3 files changed, 5 insertions, 4 deletions
diff --git a/src/models.c b/src/models.c
index 8e9a6586..47302a1d 100644
--- a/src/models.c
+++ b/src/models.c
@@ -1179,9 +1179,9 @@ Mesh GenMeshHeightmap(Image heightmap, Vector3 size)
Color *pixels = GetImageData(heightmap);
// NOTE: One vertex per pixel
- int triangleCount = (mapX-1)*(mapZ-1)*2; // One quad every four pixels
+ mesh.triangleCount = (mapX-1)*(mapZ-1)*2; // One quad every four pixels
- mesh.vertexCount = triangleCount*3;
+ mesh.vertexCount = mesh.triangleCount*3;
mesh.vertices = (float *)malloc(mesh.vertexCount*3*sizeof(float));
mesh.normals = (float *)malloc(mesh.vertexCount*3*sizeof(float));
@@ -1584,6 +1584,7 @@ Mesh GenMeshCubicmap(Image cubicmap, Vector3 cubeSize)
// Move data from mapVertices temp arays to vertices float array
mesh.vertexCount = vCounter;
+ mesh.triangleCount = vCounter/3;
mesh.vertices = (float *)malloc(mesh.vertexCount*3*sizeof(float));
mesh.normals = (float *)malloc(mesh.vertexCount*3*sizeof(float));
diff --git a/src/raylib.h b/src/raylib.h
index 253f73fb..a6a6be0c 100644
--- a/src/raylib.h
+++ b/src/raylib.h
@@ -561,7 +561,7 @@ typedef enum {
LOC_MAP_METALNESS, // LOC_MAP_SPECULAR
LOC_MAP_NORMAL,
LOC_MAP_ROUGHNESS,
- LOC_MAP_OCCUSION,
+ LOC_MAP_OCCLUSION,
LOC_MAP_EMISSION,
LOC_MAP_HEIGHT,
LOC_MAP_CUBEMAP,
diff --git a/src/rlgl.h b/src/rlgl.h
index 94331389..01278699 100644
--- a/src/rlgl.h
+++ b/src/rlgl.h
@@ -321,7 +321,7 @@ typedef unsigned char byte;
LOC_MAP_METALNESS, // LOC_MAP_SPECULAR
LOC_MAP_NORMAL,
LOC_MAP_ROUGHNESS,
- LOC_MAP_OCCUSION,
+ LOC_MAP_OCCLUSION,
LOC_MAP_EMISSION,
LOC_MAP_HEIGHT,
LOC_MAP_CUBEMAP,