diff options
| author | Ray <raysan5@gmail.com> | 2016-02-21 02:30:28 +0100 |
|---|---|---|
| committer | Ray <raysan5@gmail.com> | 2016-02-21 02:30:28 +0100 |
| commit | 2d1b2efb92725d6cf4a8b4f0660c739382d01f39 (patch) | |
| tree | 6b42c14cd9fa22e53e67ff53ce133aaadc3de987 /examples | |
| parent | 4b6e6d4dd45fc3a47b82af7eeb60871140a7eccf (diff) | |
| parent | 9ec47768121766cf12fef5d1bab8c8302cdac3a6 (diff) | |
| download | raylib-2d1b2efb92725d6cf4a8b4f0660c739382d01f39.tar.gz raylib-2d1b2efb92725d6cf4a8b4f0660c739382d01f39.zip | |
Merge pull request #84 from raysan5/develop
Integrate Develop branch
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/resources/cat.png | bin | 663451 -> 388532 bytes | |||
| -rw-r--r-- | examples/textures_image_drawing.c | 4 |
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/resources/cat.png b/examples/resources/cat.png Binary files differindex 9b5c08d2..d023aa21 100644 --- a/examples/resources/cat.png +++ b/examples/resources/cat.png diff --git a/examples/textures_image_drawing.c b/examples/textures_image_drawing.c index e09828d5..1c6a1fb9 100644 --- a/examples/textures_image_drawing.c +++ b/examples/textures_image_drawing.c @@ -25,14 +25,14 @@ int main() // NOTE: Textures MUST be loaded after Window initialization (OpenGL context is required) Image cat = LoadImage("resources/cat.png"); // Load image in CPU memory (RAM) - ImageCrop(&cat, (Rectangle){ 170, 120, 280, 380 }); // Crop an image piece + ImageCrop(&cat, (Rectangle){ 100, 10, 280, 380 }); // Crop an image piece ImageFlipHorizontal(&cat); // Flip cropped image horizontally ImageResize(&cat, 150, 200); // Resize flipped-cropped image Image parrots = LoadImage("resources/parrots.png"); // Load image in CPU memory (RAM) // Draw one image over the other with a scaling of 1.5f - ImageDraw(&parrots, cat, (Rectangle){ 0, 0, cat.width, cat.height}, (Rectangle){ 30, 40, cat.width*1.5f, cat.height*1.5f }); + ImageDraw(&parrots, cat, (Rectangle){ 0, 0, cat.width, cat.height }, (Rectangle){ 30, 40, cat.width*1.5f, cat.height*1.5f }); ImageCrop(&parrots, (Rectangle){ 0, 50, parrots.width, parrots.height - 100 }); // Crop resulting image UnloadImage(cat); // Unload image from RAM |
