MrMonopoly/raylib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correction of values ​​used only once in GenMeshCubicmap

Browse Source 
The mapWidth and mapHeight values ​​were only used as a limit in the for loop when they could be used throughout the function.
This commit is contained in:
Le Juez Victor 2023-04-29 00:34:55 +02:00 committed by GitHub
parent 98cb7a19a1
commit c5ecdc5583
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/rmodels.c
View File

@ -2944,7 +2944,7 @@ Mesh GenMeshCubicmap(Image cubicmap, Vector3 cubeSize)
int mapHeight = cubicmap.height; int mapHeight = cubicmap.height;
// NOTE: Max possible number of triangles numCubes*(12 triangles by cube) // NOTE: Max possible number of triangles numCubes*(12 triangles by cube)
int maxTriangles = cubicmap.width*cubicmap.height*12; int maxTriangles = mapWidth * mapHeight * 12;
int vCounter = 0; // Used to count vertices int vCounter = 0; // Used to count vertices
int tcCounter = 0; // Used to count texcoords int tcCounter = 0; // Used to count texcoords
@ -2996,7 +2996,7 @@ Mesh GenMeshCubicmap(Image cubicmap, Vector3 cubeSize)
Vector3 v8 = { w*(x + 0.5f), 0, h*(z + 0.5f) }; Vector3 v8 = { w*(x + 0.5f), 0, h*(z + 0.5f) };
// We check pixel color to be WHITE -> draw full cube // We check pixel color to be WHITE -> draw full cube
if (COLOR_EQUAL(pixels[z*cubicmap.width + x], WHITE)) if (COLOR_EQUAL(pixels[z*mapWidth + x], WHITE))
{ {
// Define triangles and checking collateral cubes // Define triangles and checking collateral cubes
//------------------------------------------------ //------------------------------------------------
@ -3053,7 +3053,7 @@ Mesh GenMeshCubicmap(Image cubicmap, Vector3 cubeSize)
tcCounter += 6; tcCounter += 6;
// Checking cube on bottom of current cube // Checking cube on bottom of current cube
if (((z < cubicmap.height - 1) && COLOR_EQUAL(pixels[(z + 1)*cubicmap.width + x], BLACK)) || (z == cubicmap.height - 1)) if (((z < mapHeight - 1) && COLOR_EQUAL(pixels[(z + 1)*mapWidth + x], BLACK)) || (z == mapHeight - 1))
{ {
// Define front triangles (2 tris, 6 vertex) --> v2 v7 v3, v3 v7 v8 // Define front triangles (2 tris, 6 vertex) --> v2 v7 v3, v3 v7 v8
// NOTE: Collateral occluded faces are not generated // NOTE: Collateral occluded faces are not generated
@ -3083,7 +3083,7 @@ Mesh GenMeshCubicmap(Image cubicmap, Vector3 cubeSize)
} }
// Checking cube on top of current cube // Checking cube on top of current cube
if (((z > 0) && COLOR_EQUAL(pixels[(z - 1)*cubicmap.width + x], BLACK)) || (z == 0)) if (((z > 0) && COLOR_EQUAL(pixels[(z - 1)*mapWidth + x], BLACK)) || (z == 0))
{ {
// Define back triangles (2 tris, 6 vertex) --> v1 v5 v6, v1 v4 v5 // Define back triangles (2 tris, 6 vertex) --> v1 v5 v6, v1 v4 v5
// NOTE: Collateral occluded faces are not generated // NOTE: Collateral occluded faces are not generated
@ -3113,7 +3113,7 @@ Mesh GenMeshCubicmap(Image cubicmap, Vector3 cubeSize)
} }
// Checking cube on right of current cube // Checking cube on right of current cube
if (((x < cubicmap.width - 1) && COLOR_EQUAL(pixels[z*cubicmap.width + (x + 1)], BLACK)) || (x == cubicmap.width - 1)) if (((x < mapWidth - 1) && COLOR_EQUAL(pixels[z*mapWidth + (x + 1)], BLACK)) || (x == mapWidth - 1))
{ {
// Define right triangles (2 tris, 6 vertex) --> v3 v8 v4, v4 v8 v5 // Define right triangles (2 tris, 6 vertex) --> v3 v8 v4, v4 v8 v5
// NOTE: Collateral occluded faces are not generated // NOTE: Collateral occluded faces are not generated
@ -3143,7 +3143,7 @@ Mesh GenMeshCubicmap(Image cubicmap, Vector3 cubeSize)
} }
// Checking cube on left of current cube // Checking cube on left of current cube
if (((x > 0) && COLOR_EQUAL(pixels[z*cubicmap.width + (x - 1)], BLACK)) || (x == 0)) if (((x > 0) && COLOR_EQUAL(pixels[z*mapWidth + (x - 1)], BLACK)) || (x == 0))
{ {
// Define left triangles (2 tris, 6 vertex) --> v1 v7 v2, v1 v6 v7 // Define left triangles (2 tris, 6 vertex) --> v1 v7 v2, v1 v6 v7
// NOTE: Collateral occluded faces are not generated // NOTE: Collateral occluded faces are not generated
@ -3173,7 +3173,7 @@ Mesh GenMeshCubicmap(Image cubicmap, Vector3 cubeSize)
} }
} }
// We check pixel color to be BLACK, we will only draw floor and roof // We check pixel color to be BLACK, we will only draw floor and roof
else if (COLOR_EQUAL(pixels[z*cubicmap.width + x], BLACK)) else if (COLOR_EQUAL(pixels[z*mapWidth + x], BLACK))
{ {
// Define top triangles (2 tris, 6 vertex --> v1-v2-v3, v1-v3-v4) // Define top triangles (2 tris, 6 vertex --> v1-v2-v3, v1-v3-v4)
mapVertices[vCounter] = v1; mapVertices[vCounter] = v1;