From fe3256be9fd20e4bc743934785f5a8a5d57a8832 Mon Sep 17 00:00:00 2001 From: Ray Date: Fri, 12 Mar 2021 18:00:36 +0100 Subject: [PATCH] Renamed some functions to use latest raylib version --- examples/core/core_window_flags.c | 2 +- examples/shaders/shaders_rlgl_mesh_instanced.c | 4 ++-- src/raylib.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/core/core_window_flags.c b/examples/core/core_window_flags.c index 191b5c8a..1ecd451c 100644 --- a/examples/core/core_window_flags.c +++ b/examples/core/core_window_flags.c @@ -145,7 +145,7 @@ int main(void) DrawFPS(10, 10); - DrawText(FormatText("Screen Size: [%i, %i]", GetScreenWidth(), GetScreenHeight()), 10, 40, 10, GREEN); + DrawText(TextFormat("Screen Size: [%i, %i]", GetScreenWidth(), GetScreenHeight()), 10, 40, 10, GREEN); // Draw window state info DrawText("Following flags can be set after window creation:", 10, 60, 10, GRAY); diff --git a/examples/shaders/shaders_rlgl_mesh_instanced.c b/examples/shaders/shaders_rlgl_mesh_instanced.c index 4cf780aa..702fbcb2 100644 --- a/examples/shaders/shaders_rlgl_mesh_instanced.c +++ b/examples/shaders/shaders_rlgl_mesh_instanced.c @@ -73,8 +73,8 @@ int main(void) Matrix *transforms = RL_MALLOC(count*sizeof(Matrix)); // Pre-multiplied transformations passed to rlgl - Shader shader = LoadShader(FormatText("resources/shaders/glsl%i/base_lighting_instanced.vs", GLSL_VERSION), - FormatText("resources/shaders/glsl%i/lighting.fs", GLSL_VERSION)); + Shader shader = LoadShader(TextFormat("resources/shaders/glsl%i/base_lighting_instanced.vs", GLSL_VERSION), + TextFormat("resources/shaders/glsl%i/lighting.fs", GLSL_VERSION)); // Get some shader loactions shader.locs[LOC_MATRIX_MVP] = GetShaderLocation(shader, "mvp"); diff --git a/src/raylib.h b/src/raylib.h index 659cbc74..a6a1ddff 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -151,8 +151,8 @@ #define MAGENTA CLITERAL(Color){ 255, 0, 255, 255 } // Magenta #define RAYWHITE CLITERAL(Color){ 245, 245, 245, 255 } // My own White (raylib logo) -// Temporal hack to avoid breaking old codebases using -// deprecated raylib implementation of these functions +// Temporal hacks to avoid breaking old codebases using +// deprecated raylib implementation or definitions #define FormatText TextFormat #define LoadText LoadFileText #define GetExtension GetFileExtension