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

Reverted HiDPI changes, they break 2D mode on HiDPI :(

Browse Source
This commit is contained in:
Ray 2019-04-25 13:45:37 +02:00
parent c76863b289
commit f37e55a77b
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/core.c
View File

@ -1084,7 +1084,7 @@ void BeginDrawing(void)
previousTime = currentTime; previousTime = currentTime;
rlLoadIdentity(); // Reset current matrix (MODELVIEW) rlLoadIdentity(); // Reset current matrix (MODELVIEW)
rlMultMatrixf(MatrixToFloat(screenScaling)); // If downscale required, apply it here rlMultMatrixf(MatrixToFloat(screenScaling)); // Apply screen scaling
//rlTranslatef(0.375, 0.375, 0); // HACK to have 2D pixel-perfect drawing on OpenGL 1.1 //rlTranslatef(0.375, 0.375, 0); // HACK to have 2D pixel-perfect drawing on OpenGL 1.1
// NOTE: Not required with OpenGL 3.3+ // NOTE: Not required with OpenGL 3.3+
@ -2465,7 +2465,7 @@ static bool InitGraphicsDevice(int width, int height)
float scaleRatio = 0.0f; float scaleRatio = 0.0f;
glfwGetWindowContentScale(window, &scaleRatio, NULL); glfwGetWindowContentScale(window, &scaleRatio, NULL);
scaleRatio = roundf(scaleRatio); scaleRatio = roundf(scaleRatio);
screenScaling = MatrixScale(scaleRatio, scaleRatio, scaleRatio); //screenScaling = MatrixScale(scaleRatio, scaleRatio, scaleRatio);
#endif #endif
renderWidth = screenWidth; renderWidth = screenWidth;
renderHeight = screenHeight; renderHeight = screenHeight;
@ -2882,10 +2882,9 @@ static bool InitGraphicsDevice(int width, int height)
// Set viewport parameters // Set viewport parameters
static void SetupViewport(void) static void SetupViewport(void)
{ {
#if defined(PLATFORM_DESKTOP) #if defined(__APPLE__)
// Get framebuffer size of current window // Get framebuffer size of current window
// NOTE: Required to handle HighDPI display correctly on OSX because framebuffer // NOTE: Required to handle HighDPI display correctly on OSX because framebuffer is automatically reasized to adapt to new DPI.
// is automatically reasized to adapt to new DPI.
// When OS does that, it can be detected using GLFW3 callback: glfwSetFramebufferSizeCallback() // When OS does that, it can be detected using GLFW3 callback: glfwSetFramebufferSizeCallback()
int fbWidth, fbHeight; int fbWidth, fbHeight;
glfwGetFramebufferSize(window, &fbWidth, &fbHeight); glfwGetFramebufferSize(window, &fbWidth, &fbHeight);