summaryrefslogtreecommitdiffhomepage
path: root/src/raylib.h
diff options
context:
space:
mode:
authorRay <[email protected]>2020-09-13 16:41:52 +0200
committerRay <[email protected]>2020-09-13 16:41:52 +0200
commit88c5deac8777ed9176de344cd09672618ec99070 (patch)
tree16656504c7663290dfc860bf39d9c7e9ba767036 /src/raylib.h
parent250a0e3592f534236721b43b9638f363d4fbdad5 (diff)
downloadraylib-88c5deac8777ed9176de344cd09672618ec99070.tar.gz
raylib-88c5deac8777ed9176de344cd09672618ec99070.zip
WARNING: REDESIGNED: LoadFontData()
Diffstat (limited to 'src/raylib.h')
-rw-r--r--src/raylib.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/raylib.h b/src/raylib.h
index a5739306..867061ec 100644
--- a/src/raylib.h
+++ b/src/raylib.h
@@ -1222,8 +1222,8 @@ RLAPI Font GetFontDefault(void);
RLAPI Font LoadFont(const char *fileName); // Load font from file into GPU memory (VRAM)
RLAPI Font LoadFontEx(const char *fileName, int fontSize, int *fontChars, int charsCount); // Load font from file with extended parameters
RLAPI Font LoadFontFromImage(Image image, Color key, int firstChar); // Load font from Image (XNA style)
-RLAPI CharInfo *LoadFontData(const char *fileName, int fontSize, int *fontChars, int charsCount, int type); // Load font data for further use
RLAPI Image GenImageFontAtlas(const CharInfo *chars, Rectangle **recs, int charsCount, int fontSize, int padding, int packMethod); // Generate image font atlas using chars info
+RLAPI CharInfo *LoadFontData(const char *fileData, int dataSize, int fontSize, int *fontChars, int charsCount, int type); // Load font data for further use
RLAPI void UnloadFont(Font font); // Unload Font from GPU memory (VRAM)
// Text drawing functions
@@ -1297,6 +1297,7 @@ RLAPI void DrawGizmo(Vector3 position);
// Model loading/unloading functions
RLAPI Model LoadModel(const char *fileName); // Load model from files (meshes and materials)
RLAPI Model LoadModelFromMesh(Mesh mesh); // Load model from generated mesh (default material)
+RLAPI Model LoadModelFromMemory(const char *fileType, const char *fileData, int dataSize); // Load model from memory buffer, fileType refers to extension: i.e. "obj"
RLAPI void UnloadModel(Model model); // Unload model from memory (RAM and/or VRAM)
// Mesh loading/unloading functions