mirror of
https://github.com/raysan5/raylib.git
synced 2025-09-20 02:08:14 +00:00
Remove trailing spaces
This commit is contained in:
@@ -1322,7 +1322,7 @@ Shader LoadShader(const char *vsFileName, const char *fsFileName)
|
|||||||
if (fsFileName != NULL) fShaderStr = LoadFileText(fsFileName);
|
if (fsFileName != NULL) fShaderStr = LoadFileText(fsFileName);
|
||||||
|
|
||||||
if ((vShaderStr == NULL) && (fShaderStr == NULL)) TraceLog(LOG_WARNING, "SHADER: Shader files provided are not valid, using default shader");
|
if ((vShaderStr == NULL) && (fShaderStr == NULL)) TraceLog(LOG_WARNING, "SHADER: Shader files provided are not valid, using default shader");
|
||||||
|
|
||||||
shader = LoadShaderFromMemory(vShaderStr, fShaderStr);
|
shader = LoadShaderFromMemory(vShaderStr, fShaderStr);
|
||||||
|
|
||||||
UnloadFileText(vShaderStr);
|
UnloadFileText(vShaderStr);
|
||||||
|
@@ -1493,7 +1493,7 @@ void rlEnd(void)
|
|||||||
{
|
{
|
||||||
// Reset texture to default
|
// Reset texture to default
|
||||||
rlSetTexture(RLGL.State.defaultTextureId);
|
rlSetTexture(RLGL.State.defaultTextureId);
|
||||||
|
|
||||||
// NOTE: Depth increment is dependant on rlOrtho(): z-near and z-far values,
|
// NOTE: Depth increment is dependant on rlOrtho(): z-near and z-far values,
|
||||||
// as well as depth buffer bit-depth (16bit or 24bit or 32bit)
|
// as well as depth buffer bit-depth (16bit or 24bit or 32bit)
|
||||||
// Correct increment formula would be: depthInc = (zfar - znear)/pow(2, bits)
|
// Correct increment formula would be: depthInc = (zfar - znear)/pow(2, bits)
|
||||||
|
@@ -5156,11 +5156,11 @@ static Image LoadImageFromCgltfImage(cgltf_image *cgltfImage, const char *texPat
|
|||||||
|
|
||||||
// Check mime_type for image: (cgltfImage->mime_type == "image/png")
|
// Check mime_type for image: (cgltfImage->mime_type == "image/png")
|
||||||
// NOTE: Detected that some models define mime_type as "image\\/png"
|
// NOTE: Detected that some models define mime_type as "image\\/png"
|
||||||
if ((strcmp(cgltfImage->mime_type, "image\\/png") == 0) || (strcmp(cgltfImage->mime_type, "image/png") == 0))
|
if ((strcmp(cgltfImage->mime_type, "image\\/png") == 0) || (strcmp(cgltfImage->mime_type, "image/png") == 0))
|
||||||
{
|
{
|
||||||
image = LoadImageFromMemory(".png", data, (int)cgltfImage->buffer_view->size);
|
image = LoadImageFromMemory(".png", data, (int)cgltfImage->buffer_view->size);
|
||||||
}
|
}
|
||||||
else if ((strcmp(cgltfImage->mime_type, "image\\/jpeg") == 0) || (strcmp(cgltfImage->mime_type, "image/jpeg") == 0))
|
else if ((strcmp(cgltfImage->mime_type, "image\\/jpeg") == 0) || (strcmp(cgltfImage->mime_type, "image/jpeg") == 0))
|
||||||
{
|
{
|
||||||
image = LoadImageFromMemory(".jpg", data, (int)cgltfImage->buffer_view->size);
|
image = LoadImageFromMemory(".jpg", data, (int)cgltfImage->buffer_view->size);
|
||||||
}
|
}
|
||||||
@@ -5372,7 +5372,7 @@ static Model LoadGLTF(const char *fileName)
|
|||||||
((unsigned char *)imMetallic.data)[y*imMetallic.width + x] = color.b; // Metallic color channel
|
((unsigned char *)imMetallic.data)[y*imMetallic.width + x] = color.b; // Metallic color channel
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
model.materials[j].maps[MATERIAL_MAP_ROUGHNESS].texture = LoadTextureFromImage(imRoughness);
|
model.materials[j].maps[MATERIAL_MAP_ROUGHNESS].texture = LoadTextureFromImage(imRoughness);
|
||||||
model.materials[j].maps[MATERIAL_MAP_METALNESS].texture = LoadTextureFromImage(imMetallic);
|
model.materials[j].maps[MATERIAL_MAP_METALNESS].texture = LoadTextureFromImage(imMetallic);
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user