MrMonopoly/raylib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Have we fixed the formatting properly?

Browse Source
This commit is contained in:
Reece Mackie 2019-04-27 16:45:47 +01:00
parent 4e512b44c3
commit 4ae5ead3f8
3 changed files with 634 additions and 729 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

243
src/core.c
View File

@ -886,7 +886,7 @@ int GetScreenHeight(void)
// Get native window handle // Get native window handle
void *GetWindowHandle(void) void *GetWindowHandle(void)
{ {
#if defined(PLATFORM_DESKTOP) && defined(_WIN32) #ifdef PLATFORM_DESKTOP
// NOTE: Returned handle is: void *HWND (windows.h) // NOTE: Returned handle is: void *HWND (windows.h)
return glfwGetWin32Window(window); return glfwGetWin32Window(window);
#elif defined(__linux__) #elif defined(__linux__)
@ -1179,8 +1179,7 @@ void BeginMode2D(Camera2D camera)
Matrix matScale = MatrixScale(camera.zoom, camera.zoom, 1.0f); Matrix matScale = MatrixScale(camera.zoom, camera.zoom, 1.0f);
Matrix matTranslation = MatrixTranslate(camera.offset.x + camera.target.x, camera.offset.y + camera.target.y, 0.0f); Matrix matTranslation = MatrixTranslate(camera.offset.x + camera.target.x, camera.offset.y + camera.target.y, 0.0f);
Matrix matTransform = MatrixMultiply(MatrixMultiply(matOrigin, MatrixMultiply(matScale, matRotation)), Matrix matTransform = MatrixMultiply(MatrixMultiply(matOrigin, MatrixMultiply(matScale, matRotation)), matTranslation);
matTranslation);
rlMultMatrixf(MatrixToFloat(matTransform)); // Apply transformation to modelview rlMultMatrixf(MatrixToFloat(matTransform)); // Apply transformation to modelview
} }
@ -1322,8 +1321,7 @@ Ray GetMouseRay(Vector2 mousePosition, Camera camera)
if (camera.type == CAMERA_PERSPECTIVE) if (camera.type == CAMERA_PERSPECTIVE)
{ {
// Calculate projection matrix from perspective // Calculate projection matrix from perspective
matProj = MatrixPerspective(camera.fovy * DEG2RAD, ((double)GetScreenWidth() / (double)GetScreenHeight()), 0.01, matProj = MatrixPerspective(camera.fovy*DEG2RAD, ((double)GetScreenWidth() / (double)GetScreenHeight()), 0.01, 1000.0);
1000.0);
} }
else if (camera.type == CAMERA_ORTHOGRAPHIC) else if (camera.type == CAMERA_ORTHOGRAPHIC)
{ {
@ -1365,8 +1363,7 @@ Vector2 GetWorldToScreen(Vector3 position, Camera camera)
if (camera.type == CAMERA_PERSPECTIVE) if (camera.type == CAMERA_PERSPECTIVE)
{ {
// Calculate projection matrix from perspective // Calculate projection matrix from perspective
matProj = MatrixPerspective(camera.fovy * DEG2RAD, ((double)GetScreenWidth() / (double)GetScreenHeight()), 0.01, matProj = MatrixPerspective(camera.fovy*DEG2RAD, ((double)GetScreenWidth() / (double)GetScreenHeight()), 0.01, 1000.0);
1000.0);
} }
else if (camera.type == CAMERA_ORTHOGRAPHIC) else if (camera.type == CAMERA_ORTHOGRAPHIC)
{ {
@ -1394,9 +1391,7 @@ Vector2 GetWorldToScreen(Vector3 position, Camera camera)
Vector3 ndcPos = { worldPos.x / worldPos.w, -worldPos.y / worldPos.w, worldPos.z / worldPos.w }; Vector3 ndcPos = { worldPos.x / worldPos.w, -worldPos.y / worldPos.w, worldPos.z / worldPos.w };
// Calculate 2d screen position vector // Calculate 2d screen position vector
Vector2 screenPosition = { Vector2 screenPosition = { (ndcPos.x + 1.0f) / 2.0f*(float)GetScreenWidth(), (ndcPos.y + 1.0f) / 2.0f*(float)GetScreenHeight() };
(ndcPos.x + 1.0f) / 2.0f * (float)GetScreenWidth(), (ndcPos.y + 1.0f) / 2.0f * (float)GetScreenHeight()
};
return screenPosition; return screenPosition;
} }
@ -2076,8 +2071,7 @@ float GetGamepadAxisMovement(int gamepad, int axis)
float value = 0; float value = 0;
#if !defined(PLATFORM_ANDROID) #if !defined(PLATFORM_ANDROID)
if ((gamepad < MAX_GAMEPADS) && gamepadReady[gamepad] && (axis < MAX_GAMEPAD_AXIS)) value = gamepadAxisState[gamepad if ((gamepad < MAX_GAMEPADS) && gamepadReady[gamepad] && (axis < MAX_GAMEPAD_AXIS)) value = gamepadAxisState[gamepad][axis];
][axis];
#endif #endif
return value; return value;
@ -2091,8 +2085,7 @@ bool IsGamepadButtonPressed(int gamepad, int button)
#if !defined(PLATFORM_ANDROID) #if !defined(PLATFORM_ANDROID)
if ((gamepad < MAX_GAMEPADS) && gamepadReady[gamepad] && (button < MAX_GAMEPAD_BUTTONS) && if ((gamepad < MAX_GAMEPADS) && gamepadReady[gamepad] && (button < MAX_GAMEPAD_BUTTONS) &&
(currentGamepadState[gamepad][button] != previousGamepadState[gamepad][button]) && (currentGamepadState[gamepad][button] != previousGamepadState[gamepad][button]) &&
(currentGamepadState[gamepad][button] == 1)) (currentGamepadState[gamepad][button] == 1)) pressed = true;
pressed = true;
#endif #endif
return pressed; return pressed;
@ -2105,8 +2098,7 @@ bool IsGamepadButtonDown(int gamepad, int button)
#if !defined(PLATFORM_ANDROID) #if !defined(PLATFORM_ANDROID)
if ((gamepad < MAX_GAMEPADS) && gamepadReady[gamepad] && (button < MAX_GAMEPAD_BUTTONS) && if ((gamepad < MAX_GAMEPADS) && gamepadReady[gamepad] && (button < MAX_GAMEPAD_BUTTONS) &&
(currentGamepadState[gamepad][button] == 1)) (currentGamepadState[gamepad][button] == 1)) result = true;
result = true;
#endif #endif
return result; return result;
@ -2120,8 +2112,7 @@ bool IsGamepadButtonReleased(int gamepad, int button)
#if !defined(PLATFORM_ANDROID) #if !defined(PLATFORM_ANDROID)
if ((gamepad < MAX_GAMEPADS) && gamepadReady[gamepad] && (button < MAX_GAMEPAD_BUTTONS) && if ((gamepad < MAX_GAMEPADS) && gamepadReady[gamepad] && (button < MAX_GAMEPAD_BUTTONS) &&
(currentGamepadState[gamepad][button] != previousGamepadState[gamepad][button]) && (currentGamepadState[gamepad][button] != previousGamepadState[gamepad][button]) &&
(currentGamepadState[gamepad][button] == 0)) (currentGamepadState[gamepad][button] == 0)) released = true;
released = true;
#endif #endif
return released; return released;
@ -2134,8 +2125,7 @@ bool IsGamepadButtonUp(int gamepad, int button)
#if !defined(PLATFORM_ANDROID) #if !defined(PLATFORM_ANDROID)
if ((gamepad < MAX_GAMEPADS) && gamepadReady[gamepad] && (button < MAX_GAMEPAD_BUTTONS) && if ((gamepad < MAX_GAMEPADS) && gamepadReady[gamepad] && (button < MAX_GAMEPAD_BUTTONS) &&
(currentGamepadState[gamepad][button] == 0)) (currentGamepadState[gamepad][button] == 0)) result = true;
result = true;
#endif #endif
return result; return result;
@ -2226,9 +2216,7 @@ Vector2 GetMousePosition(void)
#if defined(PLATFORM_ANDROID) #if defined(PLATFORM_ANDROID)
return GetTouchPosition(0); return GetTouchPosition(0);
#else #else
return (Vector2){ return (Vector2) { (mousePosition.x + mouseOffset.x)*mouseScale.x, (mousePosition.y + mouseOffset.y)*mouseScale.y };
(mousePosition.x + mouseOffset.x) * mouseScale.x, (mousePosition.y + mouseOffset.y) * mouseScale.y
};
#endif #endif
} }
@ -2662,8 +2650,7 @@ static bool InitGraphicsDevice(int width, int height)
EGLConfig config = NULL; EGLConfig config = NULL;
// eglGetPlatformDisplayEXT is an alternative to eglGetDisplay. It allows us to pass in display attributes, used to configure D3D11. // eglGetPlatformDisplayEXT is an alternative to eglGetDisplay. It allows us to pass in display attributes, used to configure D3D11.
PFNEGLGETPLATFORMDISPLAYEXTPROC eglGetPlatformDisplayEXT = (PFNEGLGETPLATFORMDISPLAYEXTPROC)(eglGetProcAddress( PFNEGLGETPLATFORMDISPLAYEXTPROC eglGetPlatformDisplayEXT = (PFNEGLGETPLATFORMDISPLAYEXTPROC)(eglGetProcAddress("eglGetPlatformDisplayEXT"));
"eglGetPlatformDisplayEXT"));
if (!eglGetPlatformDisplayEXT) if (!eglGetPlatformDisplayEXT)
{ {
TraceLog(LOG_WARNING, "Failed to get function eglGetPlatformDisplayEXT"); TraceLog(LOG_WARNING, "Failed to get function eglGetPlatformDisplayEXT");
@ -2944,8 +2931,7 @@ static void SetupFramebuffer(int width, int height)
// Calculate renderWidth and renderHeight, we have the display size (input params) and the desired screen size (global var) // Calculate renderWidth and renderHeight, we have the display size (input params) and the desired screen size (global var)
if ((screenWidth > displayWidth) || (screenHeight > displayHeight)) if ((screenWidth > displayWidth) || (screenHeight > displayHeight))
{ {
TraceLog(LOG_WARNING, "DOWNSCALING: Required screen size (%ix%i) is bigger than display size (%ix%i)", TraceLog(LOG_WARNING, "DOWNSCALING: Required screen size (%ix%i) is bigger than display size (%ix%i)", screenWidth, screenHeight, displayWidth, displayHeight);
screenWidth, screenHeight, displayWidth, displayHeight);
// Downscaling to fit display with border-bars // Downscaling to fit display with border-bars
float widthRatio = (float)displayWidth / (float)screenWidth; float widthRatio = (float)displayWidth / (float)screenWidth;
@ -2975,14 +2961,12 @@ static void SetupFramebuffer(int width, int height)
renderWidth = displayWidth; renderWidth = displayWidth;
renderHeight = displayHeight; renderHeight = displayHeight;
TraceLog(LOG_WARNING, "Downscale matrix generated, content will be rendered at: %i x %i", renderWidth, TraceLog(LOG_WARNING, "Downscale matrix generated, content will be rendered at: %i x %i", renderWidth, renderHeight);
renderHeight);
} }
else if ((screenWidth < displayWidth) || (screenHeight < displayHeight)) else if ((screenWidth < displayWidth) || (screenHeight < displayHeight))
{ {
// Required screen size is smaller than display size // Required screen size is smaller than display size
TraceLog(LOG_INFO, "UPSCALING: Required screen size: %i x %i -> Display size: %i x %i", screenWidth, TraceLog(LOG_INFO, "UPSCALING: Required screen size: %i x %i -> Display size: %i x %i", screenWidth, screenHeight, displayWidth, displayHeight);
screenHeight, displayWidth, displayHeight);
// Upscaling to fit display with border-bars // Upscaling to fit display with border-bars
float displayRatio = (float)displayWidth / (float)displayHeight; float displayRatio = (float)displayWidth / (float)displayHeight;
@ -3153,6 +3137,7 @@ static void PollInputEvents(void)
for (int i = 0; i < 3; i++) for (int i = 0; i < 3; i++)
{ {
previousMouseState[i] = currentMouseState[i]; previousMouseState[i] = currentMouseState[i];
} }
// Loop over pending messages // Loop over pending messages
@ -3169,132 +3154,69 @@ static void PollInputEvents(void)
switch (msg->Int0) switch (msg->Int0)
{ {
case 0x08: actualKey = KEY_BACKSPACE; case 0x08: actualKey = KEY_BACKSPACE; break;
break; case 0x20: actualKey = KEY_SPACE; break;
case 0x20: actualKey = KEY_SPACE; case 0x1B: actualKey = KEY_ESCAPE; break;
break; case 0x0D: actualKey = KEY_ENTER; break;
case 0x1B: actualKey = KEY_ESCAPE; case 0x2E: actualKey = KEY_DELETE; break;
break; case 0x27: actualKey = KEY_RIGHT; break;
case 0x0D: actualKey = KEY_ENTER; case 0x25: actualKey = KEY_LEFT; break;
break; case 0x28: actualKey = KEY_DOWN; break;
case 0x2E: actualKey = KEY_DELETE; case 0x26: actualKey = KEY_UP; break;
break; case 0x70: actualKey = KEY_F1; break;
case 0x27: actualKey = KEY_RIGHT; case 0x71: actualKey = KEY_F2; break;
break; case 0x72: actualKey = KEY_F3; break;
case 0x25: actualKey = KEY_LEFT; case 0x73: actualKey = KEY_F4; break;
break; case 0x74: actualKey = KEY_F5; break;
case 0x28: actualKey = KEY_DOWN; case 0x75: actualKey = KEY_F6; break;
break; case 0x76: actualKey = KEY_F7; break;
case 0x26: actualKey = KEY_UP; case 0x77: actualKey = KEY_F8; break;
break; case 0x78: actualKey = KEY_F9; break;
case 0x70: actualKey = KEY_F1; case 0x79: actualKey = KEY_F10; break;
break; case 0x7A: actualKey = KEY_F11; break;
case 0x71: actualKey = KEY_F2; case 0x7B: actualKey = KEY_F12; break;
break; case 0xA0: actualKey = KEY_LEFT_SHIFT; break;
case 0x72: actualKey = KEY_F3; case 0xA2: actualKey = KEY_LEFT_CONTROL; break;
break; case 0xA4: actualKey = KEY_LEFT_ALT; break;
case 0x73: actualKey = KEY_F4; case 0xA1: actualKey = KEY_RIGHT_SHIFT; break;
break; case 0xA3: actualKey = KEY_RIGHT_CONTROL; break;
case 0x74: actualKey = KEY_F5; case 0xA5: actualKey = KEY_RIGHT_ALT; break;
break; case 0x30: actualKey = KEY_ZERO; break;
case 0x75: actualKey = KEY_F6; case 0x31: actualKey = KEY_ONE; break;
break; case 0x32: actualKey = KEY_TWO; break;
case 0x76: actualKey = KEY_F7; case 0x33: actualKey = KEY_THREE; break;
break; case 0x34: actualKey = KEY_FOUR; break;
case 0x77: actualKey = KEY_F8; case 0x35: actualKey = KEY_FIVE; break;
break; case 0x36: actualKey = KEY_SIX; break;
case 0x78: actualKey = KEY_F9; case 0x37: actualKey = KEY_SEVEN; break;
break; case 0x38: actualKey = KEY_EIGHT; break;
case 0x79: actualKey = KEY_F10; case 0x39: actualKey = KEY_NINE; break;
break; case 0x41: actualKey = KEY_A; break;
case 0x7A: actualKey = KEY_F11; case 0x42: actualKey = KEY_B; break;
break; case 0x43: actualKey = KEY_C; break;
case 0x7B: actualKey = KEY_F12; case 0x44: actualKey = KEY_D; break;
break; case 0x45: actualKey = KEY_E; break;
case 0xA0: actualKey = KEY_LEFT_SHIFT; case 0x46: actualKey = KEY_F; break;
break; case 0x47: actualKey = KEY_G; break;
case 0xA2: actualKey = KEY_LEFT_CONTROL; case 0x48: actualKey = KEY_H; break;
break; case 0x49: actualKey = KEY_I; break;
case 0xA4: actualKey = KEY_LEFT_ALT; case 0x4A: actualKey = KEY_J; break;
break; case 0x4B: actualKey = KEY_K; break;
case 0xA1: actualKey = KEY_RIGHT_SHIFT; case 0x4C: actualKey = KEY_L; break;
break; case 0x4D: actualKey = KEY_M; break;
case 0xA3: actualKey = KEY_RIGHT_CONTROL; case 0x4E: actualKey = KEY_N; break;
break; case 0x4F: actualKey = KEY_O; break;
case 0xA5: actualKey = KEY_RIGHT_ALT; case 0x50: actualKey = KEY_P; break;
break; case 0x51: actualKey = KEY_Q; break;
case 0x30: actualKey = KEY_ZERO; case 0x52: actualKey = KEY_R; break;
break; case 0x53: actualKey = KEY_S; break;
case 0x31: actualKey = KEY_ONE; case 0x54: actualKey = KEY_T; break;
break; case 0x55: actualKey = KEY_U; break;
case 0x32: actualKey = KEY_TWO; case 0x56: actualKey = KEY_V; break;
break; case 0x57: actualKey = KEY_W; break;
case 0x33: actualKey = KEY_THREE; case 0x58: actualKey = KEY_X; break;
break; case 0x59: actualKey = KEY_Y; break;
case 0x34: actualKey = KEY_FOUR; case 0x5A: actualKey = KEY_Z; break;
break;
case 0x35: actualKey = KEY_FIVE;
break;
case 0x36: actualKey = KEY_SIX;
break;
case 0x37: actualKey = KEY_SEVEN;
break;
case 0x38: actualKey = KEY_EIGHT;
break;
case 0x39: actualKey = KEY_NINE;
break;
case 0x41: actualKey = KEY_A;
break;
case 0x42: actualKey = KEY_B;
break;
case 0x43: actualKey = KEY_C;
break;
case 0x44: actualKey = KEY_D;
break;
case 0x45: actualKey = KEY_E;
break;
case 0x46: actualKey = KEY_F;
break;
case 0x47: actualKey = KEY_G;
break;
case 0x48: actualKey = KEY_H;
break;
case 0x49: actualKey = KEY_I;
break;
case 0x4A: actualKey = KEY_J;
break;
case 0x4B: actualKey = KEY_K;
break;
case 0x4C: actualKey = KEY_L;
break;
case 0x4D: actualKey = KEY_M;
break;
case 0x4E: actualKey = KEY_N;
break;
case 0x4F: actualKey = KEY_O;
break;
case 0x50: actualKey = KEY_P;
break;
case 0x51: actualKey = KEY_Q;
break;
case 0x52: actualKey = KEY_R;
break;
case 0x53: actualKey = KEY_S;
break;
case 0x54: actualKey = KEY_T;
break;
case 0x55: actualKey = KEY_U;
break;
case 0x56: actualKey = KEY_V;
break;
case 0x57: actualKey = KEY_W;
break;
case 0x58: actualKey = KEY_X;
break;
case 0x59: actualKey = KEY_Y;
break;
case 0x5A: actualKey = KEY_Z;
break;
} }
if (actualKey > -1) if (actualKey > -1)
@ -3357,8 +3279,7 @@ static void PollInputEvents(void)
rlViewport(0, 0, screenWidth, screenHeight); // Set viewport width and height rlViewport(0, 0, screenWidth, screenHeight); // Set viewport width and height
rlMatrixMode(RL_PROJECTION); // Switch to PROJECTION matrix rlMatrixMode(RL_PROJECTION); // Switch to PROJECTION matrix
rlLoadIdentity(); // Reset current matrix (PROJECTION) rlLoadIdentity(); // Reset current matrix (PROJECTION)
rlOrtho(0, screenWidth, screenHeight, 0, 0.0f, 1.0f); rlOrtho(0, screenWidth, screenHeight, 0, 0.0f, 1.0f); // Orthographic projection mode with top-left corner at (0,0)
// Orthographic projection mode with top-left corner at (0,0)
rlMatrixMode(RL_MODELVIEW); // Switch back to MODELVIEW matrix rlMatrixMode(RL_MODELVIEW); // Switch back to MODELVIEW matrix
rlLoadIdentity(); // Reset current matrix (MODELVIEW) rlLoadIdentity(); // Reset current matrix (MODELVIEW)
rlClearScreenBuffers(); // Clear screen buffers (color and depth) rlClearScreenBuffers(); // Clear screen buffers (color and depth)
@ -3374,6 +3295,7 @@ static void PollInputEvents(void)
windowResized = true; windowResized = true;
break; break;
} }
} }
DeleteUWPMessage(msg); //Delete, we are done DeleteUWPMessage(msg); //Delete, we are done
@ -4968,8 +4890,7 @@ static void LogoAnimation(void)
DrawRectangle(screenWidth / 2 - 112, screenHeight / 2 - 112, 224, 224, Fade(RAYWHITE, alpha)); DrawRectangle(screenWidth / 2 - 112, screenHeight / 2 - 112, 224, 224, Fade(RAYWHITE, alpha));
DrawText(TextSubtext("raylib", 0, lettersCount), screenWidth / 2 - 44, screenHeight / 2 + 48, 50, DrawText(TextSubtext("raylib", 0, lettersCount), screenWidth / 2 - 44, screenHeight / 2 + 48, 50, Fade(BLACK, alpha));
Fade(BLACK, alpha));
} }
EndDrawing(); EndDrawing();

18
src/utils.c
View File

@ -134,18 +134,12 @@ void TraceLog(int logType, const char* text, ...)
switch (logType) switch (logType)
{ {
case LOG_TRACE: strcpy(buffer, "TRACE: "); case LOG_TRACE: strcpy(buffer, "TRACE: "); break;
break; case LOG_DEBUG: strcpy(buffer, "DEBUG: "); break;
case LOG_DEBUG: strcpy(buffer, "DEBUG: "); case LOG_INFO: strcpy(buffer, "INFO: "); break;
break; case LOG_WARNING: strcpy(buffer, "WARNING: "); break;
case LOG_INFO: strcpy(buffer, "INFO: "); case LOG_ERROR: strcpy(buffer, "ERROR: "); break;
break; case LOG_FATAL: strcpy(buffer, "FATAL: "); break;
case LOG_WARNING: strcpy(buffer, "WARNING: ");
break;
case LOG_ERROR: strcpy(buffer, "ERROR: ");
break;
case LOG_FATAL: strcpy(buffer, "FATAL: ");
break;
default: break; default: break;
} }

30
src/utils.h
View File

@ -72,28 +72,18 @@ typedef enum
HideMouse, HideMouse,
LockMouse, LockMouse,
UnlockMouse, UnlockMouse,
SetMouseLocation, SetMouseLocation, //Vector0 (pos)
//Vector0 (pos)
//Recieve (Into C) //Recieve (Into C)
RegisterKey, RegisterKey, //Int0 (key), Char0 (status)
//Int0 (key), Char0 (status) RegisterClick, //Int0 (button), Char0 (status)
RegisterClick, ScrollWheelUpdate, //Int0 (delta)
//Int0 (button), Char0 (status) UpdateMouseLocation, //Vector0 (pos)
ScrollWheelUpdate, MarkGamepadActive, //Int0 (gamepad), Bool0 (active or not)
//Int0 (delta) MarkGamepadButton, //Int0 (gamepad), Int1 (button), Char0 (status)
UpdateMouseLocation, MarkGamepadAxis,//Int0 (gamepad), int1 (axis), Float0 (value)
//Vector0 (pos) SetDisplayDims, //Vector0 (display dimensions)
MarkGamepadActive, HandleResize, //Vector0 (new dimensions) - Onresized event
//Int0 (gamepad), Bool0 (active or not)
MarkGamepadButton,
//Int0 (gamepad), Int1 (button), Char0 (status)
MarkGamepadAxis,
//Int0 (gamepad), int1 (axis), Float0 (value)
SetDisplayDims,
//Vector0 (display dimensions)
HandleResize,
//Vector0 (new dimensions) - Onresized event
} UWPMessageType; } UWPMessageType;
typedef struct UWPMessage typedef struct UWPMessage