Merge branch 'master' of https://github.com/raysan5/raylib
This commit is contained in:
commit
f596815973
|
|
@ -38,7 +38,7 @@ int main()
|
||||||
{
|
{
|
||||||
// Update
|
// Update
|
||||||
//----------------------------------------------------------------------------------
|
//----------------------------------------------------------------------------------
|
||||||
// Detect if X-button or KEY_ESCAPE have been presssed to close window
|
// Detect if X-button or KEY_ESCAPE have been pressed to close window
|
||||||
if (WindowShouldClose() || IsKeyPressed(KEY_ESCAPE)) exitWindowRequested = true;
|
if (WindowShouldClose() || IsKeyPressed(KEY_ESCAPE)) exitWindowRequested = true;
|
||||||
|
|
||||||
if (exitWindowRequested)
|
if (exitWindowRequested)
|
||||||
|
|
@ -74,4 +74,4 @@ int main()
|
||||||
//--------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -29,7 +29,7 @@ int main(void)
|
||||||
|
|
||||||
InitWindow(screenWidth, screenHeight, "raylib [textures] example - mouse painting");
|
InitWindow(screenWidth, screenHeight, "raylib [textures] example - mouse painting");
|
||||||
|
|
||||||
// Colours to choose from
|
// Colors to choose from
|
||||||
Color colors[MAX_COLORS_COUNT] = {
|
Color colors[MAX_COLORS_COUNT] = {
|
||||||
RAYWHITE, YELLOW, GOLD, ORANGE, PINK, RED, MAROON, GREEN, LIME, DARKGREEN,
|
RAYWHITE, YELLOW, GOLD, ORANGE, PINK, RED, MAROON, GREEN, LIME, DARKGREEN,
|
||||||
SKYBLUE, BLUE, DARKBLUE, PURPLE, VIOLET, DARKPURPLE, BEIGE, BROWN, DARKBROWN,
|
SKYBLUE, BLUE, DARKBLUE, PURPLE, VIOLET, DARKPURPLE, BEIGE, BROWN, DARKBROWN,
|
||||||
|
|
|
||||||
|
|
@ -4574,7 +4574,7 @@ static Image LoadPVR(const unsigned char *fileData, unsigned int fileSize)
|
||||||
unsigned int flags;
|
unsigned int flags;
|
||||||
unsigned char channels[4]; // pixelFormat high part
|
unsigned char channels[4]; // pixelFormat high part
|
||||||
unsigned char channelDepth[4]; // pixelFormat low part
|
unsigned char channelDepth[4]; // pixelFormat low part
|
||||||
unsigned int colourSpace;
|
unsigned int colorSpace;
|
||||||
unsigned int channelType;
|
unsigned int channelType;
|
||||||
unsigned int height;
|
unsigned int height;
|
||||||
unsigned int width;
|
unsigned int width;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user