diff options
| author | raysan5 <raysan5@gmail.com> | 2015-05-11 00:15:46 +0200 |
|---|---|---|
| committer | raysan5 <raysan5@gmail.com> | 2015-05-11 00:15:46 +0200 |
| commit | a7714c842f72b8d41829caa7564f91abb3ffbd6b (patch) | |
| tree | fea199fdb2d67d184529d8442b6cbea7b78b92df /src/raylib.h | |
| parent | eae98e1c34512579d69966c99713bd0c45bfcb50 (diff) | |
| download | raylib-a7714c842f72b8d41829caa7564f91abb3ffbd6b.tar.gz raylib-a7714c842f72b8d41829caa7564f91abb3ffbd6b.zip | |
raymath module review and other changes
Complete review of matrix rotation math
Check compressed textures support
WIP: LoadImageFromData()
Diffstat (limited to 'src/raylib.h')
| -rw-r--r-- | src/raylib.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/raylib.h b/src/raylib.h index bd1692d2..0eafa390 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -515,16 +515,15 @@ bool CheckCollisionPointTriangle(Vector2 point, Vector2 p1, Vector2 p2, Vector2 //------------------------------------------------------------------------------------ Image LoadImage(const char *fileName); // Load an image into CPU memory (RAM) Image LoadImageFromRES(const char *rresName, int resId); // Load an image from rRES file (raylib Resource) +Image LoadImageFromData(Color *pixels, int width, int height, int format); // Load image from Color array data Texture2D LoadTexture(const char *fileName); // Load an image as texture into GPU memory Texture2D LoadTextureEx(void *data, int width, int height, int textureFormat, int mipmapCount, bool genMipmaps); // Load a texture from raw data into GPU memory Texture2D LoadTextureFromRES(const char *rresName, int resId); // Load an image as texture from rRES file (raylib Resource) Texture2D LoadTextureFromImage(Image image, bool genMipmaps); // Load a texture from image data (and generate mipmaps) -Texture2D CreateTexture(Image image, bool genMipmaps); // [DEPRECATED] Same as LoadTextureFromImage() void UnloadImage(Image image); // Unload image from CPU memory (RAM) void UnloadTexture(Texture2D texture); // Unload texture from GPU memory void ConvertToPOT(Image *image, Color fillColor); // Convert image to POT (power-of-two) Color *GetPixelData(Image image); // Get pixel data from image as a Color struct array -void SetPixelData(Image *image, Color *pixels, int format); // Set image data from Color struct array void DrawTexture(Texture2D texture, int posX, int posY, Color tint); // Draw a Texture2D void DrawTextureV(Texture2D texture, Vector2 position, Color tint); // Draw a Texture2D with position defined as Vector2 |
