Skip to content

Commit c10e307

Browse files
JohnnyCena123JohnnyCena123
committed
rename FLAG_CHECK() to FLAG_IS_SET() 
1 parent fa4f7a2 commit c10e307

8 files changed

Lines changed: 242 additions & 242 deletions

File tree

‎src/platforms/rcore_android.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -887,7 +887,7 @@ static int InitGraphicsDevice(void)
887887

888888
EGLint samples = 0;
889889
EGLint sampleBuffer = 0;
890-
if (FLAG_CHECK(CORE.Window.flags, FLAG_MSAA_4X_HINT) > 0)
890+
if (FLAG_IS_SET(CORE.Window.flags, FLAG_MSAA_4X_HINT))
891891
{
892892
samples = 4;
893893
sampleBuffer = 1;
@@ -992,7 +992,7 @@ static int InitGraphicsDevice(void)
992992

993993
CORE.Window.ready = true;
994994

995-
if (FLAG_CHECK(CORE.Window.flags, FLAG_WINDOW_MINIMIZED) > 0) MinimizeWindow();
995+
if (FLAG_IS_SET(CORE.Window.flags, FLAG_WINDOW_MINIMIZED)) MinimizeWindow();
996996

997997
return 0;
998998
}
@@ -1059,7 +1059,7 @@ static void AndroidCommandCallback(struct android_app *app, int32_t cmd)
10591059
// Set font white rectangle for shapes drawing, so shapes and text can be batched together
10601060
// WARNING: rshapes module is required, if not available, default internal white rectangle is used
10611061
Rectangle rec = GetFontDefault().recs[95];
1062-
if (FLAG_CHECK(CORE.Window.flags, FLAG_MSAA_4X_HINT) > 0)
1062+
if (FLAG_IS_SET(CORE.Window.flags, FLAG_MSAA_4X_HINT))
10631063
{
10641064
// NOTE: We try to maxime rec padding to avoid pixel bleeding on MSAA filtering
10651065
SetShapesTexture(GetFontDefault().texture, (Rectangle){ rec.x + 2, rec.y + 2, 1, 1 });
@@ -1187,8 +1187,8 @@ static int32_t AndroidInputCallback(struct android_app *app, AInputEvent *event)
11871187

11881188
if (type == AINPUT_EVENT_TYPE_MOTION)
11891189
{
1190-
if ((FLAG_CHECK(source, AINPUT_SOURCE_JOYSTICK) == AINPUT_SOURCE_JOYSTICK) ||
1191-
(FLAG_CHECK(source, AINPUT_SOURCE_GAMEPAD) == AINPUT_SOURCE_GAMEPAD))
1190+
if ((FLAG_IS_SET(source, AINPUT_SOURCE_JOYSTICK) == AINPUT_SOURCE_JOYSTICK) ||
1191+
(FLAG_IS_SET(source, AINPUT_SOURCE_GAMEPAD) == AINPUT_SOURCE_GAMEPAD))
11921192
{
11931193
// For now we'll assume a single gamepad which we "detect" on its input event
11941194
CORE.Input.Gamepad.ready[0] = true;
@@ -1251,8 +1251,8 @@ static int32_t AndroidInputCallback(struct android_app *app, AInputEvent *event)
12511251
//int32_t AKeyEvent_getMetaState(event);
12521252

12531253
// Handle gamepad button presses and releases
1254-
if ((FLAG_CHECK(source, AINPUT_SOURCE_JOYSTICK) == AINPUT_SOURCE_JOYSTICK) ||
1255-
(FLAG_CHECK(source, AINPUT_SOURCE_GAMEPAD) == AINPUT_SOURCE_GAMEPAD))
1254+
if ((FLAG_IS_SET(source, AINPUT_SOURCE_JOYSTICK) == AINPUT_SOURCE_JOYSTICK) ||
1255+
(FLAG_IS_SET(source, AINPUT_SOURCE_GAMEPAD) == AINPUT_SOURCE_GAMEPAD))
12561256
{
12571257
// For now we'll assume a single gamepad which we "detect" on its input event
12581258
CORE.Input.Gamepad.ready[0] = true;

‎src/platforms/rcore_desktop_glfw.c‎

Lines changed: 51 additions & 51 deletions
Large diffs are not rendered by default.

‎src/platforms/rcore_desktop_rgfw.c‎

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ void ToggleFullscreen(void)
324324

325325
// Try to enable GPU V-Sync, so frames are limited to screen refresh rate (60Hz -> 60 FPS)
326326
// NOTE: V-Sync can be enabled by graphic driver configuration
327-
if (FLAG_CHECK(CORE.Window.flags, FLAG_VSYNC_HINT) > 0) RGFW_window_swapInterval(platform.window, 1);
327+
if (FLAG_IS_SET(CORE.Window.flags, FLAG_VSYNC_HINT)) RGFW_window_swapInterval(platform.window, 1);
328328
}
329329

330330
// Toggle borderless windowed mode
@@ -366,7 +366,7 @@ void MinimizeWindow(void)
366366
// Restore window from being minimized/maximized
367367
void RestoreWindow(void)
368368
{
369-
if (!FLAG_CHECK(CORE.Window.flags, FLAG_WINDOW_UNFOCUSED)) RGFW_window_focus(platform.window);
369+
if (!FLAG_IS_SET(CORE.Window.flags, FLAG_WINDOW_UNFOCUSED)) RGFW_window_focus(platform.window);
370370

371371
RGFW_window_restore(platform.window);
372372
}
@@ -378,66 +378,66 @@ void SetWindowState(unsigned int flags)
378378

379379
FLAG_SET(CORE.Window.flags, flags);
380380

381-
if (FLAG_CHECK(flags, FLAG_VSYNC_HINT))
381+
if (FLAG_IS_SET(flags, FLAG_VSYNC_HINT))
382382
{
383383
RGFW_window_swapInterval(platform.window, 1);
384384
}
385-
if (FLAG_CHECK(flags, FLAG_FULLSCREEN_MODE))
385+
if (FLAG_IS_SET(flags, FLAG_FULLSCREEN_MODE))
386386
{
387387
if (!CORE.Window.fullscreen) ToggleFullscreen();
388388
}
389-
if (FLAG_CHECK(flags, FLAG_WINDOW_RESIZABLE))
389+
if (FLAG_IS_SET(flags, FLAG_WINDOW_RESIZABLE))
390390
{
391391
RGFW_window_setMaxSize(platform.window, RGFW_AREA(0, 0));
392392
RGFW_window_setMinSize(platform.window, RGFW_AREA(0, 0));
393393
}
394-
if (FLAG_CHECK(flags, FLAG_WINDOW_UNDECORATED))
394+
if (FLAG_IS_SET(flags, FLAG_WINDOW_UNDECORATED))
395395
{
396396
RGFW_window_setBorder(platform.window, 0);
397397
}
398-
if (FLAG_CHECK(flags, FLAG_WINDOW_HIDDEN))
398+
if (FLAG_IS_SET(flags, FLAG_WINDOW_HIDDEN))
399399
{
400400
RGFW_window_hide(platform.window);
401401
}
402-
if (FLAG_CHECK(flags, FLAG_WINDOW_MINIMIZED))
402+
if (FLAG_IS_SET(flags, FLAG_WINDOW_MINIMIZED))
403403
{
404404
RGFW_window_minimize(platform.window);
405405
}
406-
if (FLAG_CHECK(flags, FLAG_WINDOW_MAXIMIZED))
406+
if (FLAG_IS_SET(flags, FLAG_WINDOW_MAXIMIZED))
407407
{
408408
RGFW_window_maximize(platform.window);
409409
}
410-
if (FLAG_CHECK(flags, FLAG_WINDOW_UNFOCUSED))
410+
if (FLAG_IS_SET(flags, FLAG_WINDOW_UNFOCUSED))
411411
{
412412
FLAG_SET(CORE.Window.flags, FLAG_WINDOW_UNFOCUSED);
413413
FLAG_CLEAR(platform.window->_flags, RGFW_windowFocusOnShow);
414414
RGFW_window_setFlags(platform.window, platform.window->_flags);
415415
}
416-
if (FLAG_CHECK(flags, FLAG_WINDOW_TOPMOST))
416+
if (FLAG_IS_SET(flags, FLAG_WINDOW_TOPMOST))
417417
{
418418
RGFW_window_setFloating(platform.window, RGFW_TRUE);
419419
}
420-
if (FLAG_CHECK(flags, FLAG_WINDOW_TRANSPARENT))
420+
if (FLAG_IS_SET(flags, FLAG_WINDOW_TRANSPARENT))
421421
{
422422
TRACELOG(LOG_WARNING, "WINDOW: Framebuffer transparency can only be configured before window initialization");
423423
}
424-
if (FLAG_CHECK(flags, FLAG_WINDOW_HIGHDPI))
424+
if (FLAG_IS_SET(flags, FLAG_WINDOW_HIGHDPI))
425425
{
426426
TRACELOG(LOG_WARNING, "WINDOW: High DPI can only be configured before window initialization");
427427
}
428-
if (FLAG_CHECK(flags, FLAG_WINDOW_MOUSE_PASSTHROUGH))
428+
if (FLAG_IS_SET(flags, FLAG_WINDOW_MOUSE_PASSTHROUGH))
429429
{
430430
RGFW_window_setMousePassthrough(platform.window, 1);
431431
}
432-
if (FLAG_CHECK(flags, FLAG_BORDERLESS_WINDOWED_MODE))
432+
if (FLAG_IS_SET(flags, FLAG_BORDERLESS_WINDOWED_MODE))
433433
{
434434
ToggleBorderlessWindowed();
435435
}
436-
if (FLAG_CHECK(flags, FLAG_MSAA_4X_HINT))
436+
if (FLAG_IS_SET(flags, FLAG_MSAA_4X_HINT))
437437
{
438438
RGFW_setGLHint(RGFW_glSamples, 4);
439439
}
440-
if (FLAG_CHECK(flags, FLAG_INTERLACED_HINT))
440+
if (FLAG_IS_SET(flags, FLAG_INTERLACED_HINT))
441441
{
442442
TRACELOG(LOG_WARNING, "RPI: Interlaced mode can only be configured before window initialization");
443443
}
@@ -448,70 +448,70 @@ void ClearWindowState(unsigned int flags)
448448
{
449449
FLAG_CLEAR(CORE.Window.flags, flags);
450450

451-
if (FLAG_CHECK(flags, FLAG_VSYNC_HINT))
451+
if (FLAG_IS_SET(flags, FLAG_VSYNC_HINT))
452452
{
453453
RGFW_window_swapInterval(platform.window, 0);
454454
}
455-
if (FLAG_CHECK(flags, FLAG_FULLSCREEN_MODE))
455+
if (FLAG_IS_SET(flags, FLAG_FULLSCREEN_MODE))
456456
{
457457
if (CORE.Window.fullscreen) ToggleFullscreen();
458458
}
459-
if (FLAG_CHECK(flags, FLAG_WINDOW_RESIZABLE))
459+
if (FLAG_IS_SET(flags, FLAG_WINDOW_RESIZABLE))
460460
{
461461
RGFW_window_setMaxSize(platform.window, RGFW_AREA(platform.window->r.w, platform.window->r.h));
462462
RGFW_window_setMinSize(platform.window, RGFW_AREA(platform.window->r.w, platform.window->r.h));
463463
}
464-
if (FLAG_CHECK(flags, FLAG_WINDOW_UNDECORATED))
464+
if (FLAG_IS_SET(flags, FLAG_WINDOW_UNDECORATED))
465465
{
466466
RGFW_window_setBorder(platform.window, 1);
467467
}
468-
if (FLAG_CHECK(flags, FLAG_WINDOW_HIDDEN))
468+
if (FLAG_IS_SET(flags, FLAG_WINDOW_HIDDEN))
469469
{
470-
if (!FLAG_CHECK(CORE.Window.flags, FLAG_WINDOW_UNFOCUSED)) RGFW_window_focus(platform.window);
470+
if (!FLAG_IS_SET(CORE.Window.flags, FLAG_WINDOW_UNFOCUSED)) RGFW_window_focus(platform.window);
471471

472472
RGFW_window_show(platform.window);
473473
}
474-
if (FLAG_CHECK(flags, FLAG_WINDOW_MINIMIZED))
474+
if (FLAG_IS_SET(flags, FLAG_WINDOW_MINIMIZED))
475475
{
476-
if (!FLAG_CHECK(CORE.Window.flags, FLAG_WINDOW_UNFOCUSED)) RGFW_window_focus(platform.window);
476+
if (!FLAG_IS_SET(CORE.Window.flags, FLAG_WINDOW_UNFOCUSED)) RGFW_window_focus(platform.window);
477477

478478
RGFW_window_restore(platform.window);
479479
}
480-
if (FLAG_CHECK(flags, FLAG_WINDOW_MAXIMIZED))
480+
if (FLAG_IS_SET(flags, FLAG_WINDOW_MAXIMIZED))
481481
{
482-
if (!FLAG_CHECK(CORE.Window.flags, FLAG_WINDOW_UNFOCUSED)) RGFW_window_focus(platform.window);
482+
if (!FLAG_IS_SET(CORE.Window.flags, FLAG_WINDOW_UNFOCUSED)) RGFW_window_focus(platform.window);
483483

484484
RGFW_window_restore(platform.window);
485485
}
486-
if (FLAG_CHECK(flags, FLAG_WINDOW_UNFOCUSED))
486+
if (FLAG_IS_SET(flags, FLAG_WINDOW_UNFOCUSED))
487487
{
488488
RGFW_window_setFlags(platform.window, platform.window->_flags | RGFW_windowFocusOnShow);
489489
}
490-
if (FLAG_CHECK(flags, FLAG_WINDOW_TOPMOST))
490+
if (FLAG_IS_SET(flags, FLAG_WINDOW_TOPMOST))
491491
{
492492
RGFW_window_setFloating(platform.window, RGFW_FALSE);
493493
}
494-
if (FLAG_CHECK(flags, FLAG_WINDOW_TRANSPARENT))
494+
if (FLAG_IS_SET(flags, FLAG_WINDOW_TRANSPARENT))
495495
{
496496
TRACELOG(LOG_WARNING, "WINDOW: Framebuffer transparency can only be configured before window initialization");
497497
}
498-
if (FLAG_CHECK(flags, FLAG_WINDOW_HIGHDPI))
498+
if (FLAG_IS_SET(flags, FLAG_WINDOW_HIGHDPI))
499499
{
500500
TRACELOG(LOG_WARNING, "WINDOW: High DPI can only be configured before window initialization");
501501
}
502-
if (FLAG_CHECK(flags, FLAG_WINDOW_MOUSE_PASSTHROUGH))
502+
if (FLAG_IS_SET(flags, FLAG_WINDOW_MOUSE_PASSTHROUGH))
503503
{
504504
RGFW_window_setMousePassthrough(platform.window, 0);
505505
}
506-
if (FLAG_CHECK(flags, FLAG_BORDERLESS_WINDOWED_MODE))
506+
if (FLAG_IS_SET(flags, FLAG_BORDERLESS_WINDOWED_MODE))
507507
{
508508
if (CORE.Window.fullscreen) ToggleBorderlessWindowed();
509509
}
510-
if (FLAG_CHECK(flags, FLAG_MSAA_4X_HINT))
510+
if (FLAG_IS_SET(flags, FLAG_MSAA_4X_HINT))
511511
{
512512
RGFW_setGLHint(RGFW_glSamples, 0);
513513
}
514-
if (FLAG_CHECK(flags, FLAG_INTERLACED_HINT))
514+
if (FLAG_IS_SET(flags, FLAG_INTERLACED_HINT))
515515
{
516516
TRACELOG(LOG_WARNING, "RPI: Interlaced mode can only be configured before window initialization");
517517
}
@@ -968,7 +968,7 @@ void PollInputEvents(void)
968968
CORE.Window.resizedLastFrame = false;
969969

970970
CORE.Input.Mouse.previousPosition = CORE.Input.Mouse.currentPosition;
971-
if (FLAG_CHECK(platform.window->_flags, RGFW_HOLD_MOUSE))
971+
if (FLAG_IS_SET(platform.window->_flags, RGFW_HOLD_MOUSE))
972972
{
973973
CORE.Input.Mouse.previousPosition = (Vector2){ 0.0f, 0.0f };
974974
CORE.Input.Mouse.currentPosition = (Vector2){ 0.0f, 0.0f };
@@ -1144,7 +1144,7 @@ void PollInputEvents(void)
11441144
} break;
11451145
case RGFW_mousePosChanged:
11461146
{
1147-
if (FLAG_CHECK(platform.window->_flags, RGFW_HOLD_MOUSE))
1147+
if (FLAG_IS_SET(platform.window->_flags, RGFW_HOLD_MOUSE))
11481148
{
11491149
CORE.Input.Mouse.currentPosition.x += (float)event->vector.x;
11501150
CORE.Input.Mouse.currentPosition.y += (float)event->vector.y;
@@ -1268,24 +1268,24 @@ int InitPlatform(void)
12681268
unsigned int flags = RGFW_windowCenter | RGFW_windowAllowDND;
12691269

12701270
// Check window creation flags
1271-
if ((FLAG_CHECK(CORE.Window.flags, FLAG_FULLSCREEN_MODE)) > 0)
1271+
if (FLAG_IS_SET(CORE.Window.flags, FLAG_FULLSCREEN_MODE))
12721272
{
12731273
CORE.Window.fullscreen = true;
12741274
FLAG_SET(flags, RGFW_windowFullscreen);
12751275
}
12761276

1277-
if (FLAG_CHECK(CORE.Window.flags, FLAG_BORDERLESS_WINDOWED_MODE) > 0)
1277+
if (FLAG_IS_SET(CORE.Window.flags, FLAG_BORDERLESS_WINDOWED_MODE))
12781278
{
12791279
CORE.Window.fullscreen = true;
12801280
FLAG_SET(flags, RGFW_windowedFullscreen);
12811281
}
12821282

1283-
if (FLAG_CHECK(CORE.Window.flags, FLAG_WINDOW_UNDECORATED) > 0) FLAG_SET(flags, RGFW_windowNoBorder);
1284-
if (FLAG_CHECK(CORE.Window.flags, FLAG_WINDOW_RESIZABLE) == 0) FLAG_SET(flags, RGFW_windowNoResize);
1285-
if (FLAG_CHECK(CORE.Window.flags, FLAG_WINDOW_TRANSPARENT) > 0) FLAG_SET(flags, RGFW_windowTransparent);
1286-
if (FLAG_CHECK(CORE.Window.flags, FLAG_FULLSCREEN_MODE) > 0) FLAG_SET(flags, RGFW_windowFullscreen);
1287-
if (FLAG_CHECK(CORE.Window.flags, FLAG_WINDOW_HIDDEN) > 0) FLAG_SET(flags, RGFW_windowHide);
1288-
if (FLAG_CHECK(CORE.Window.flags, FLAG_WINDOW_MAXIMIZED) > 0) FLAG_SET(flags, RGFW_windowMaximize);
1283+
if (FLAG_IS_SET(CORE.Window.flags, FLAG_WINDOW_UNDECORATED)) FLAG_SET(flags, RGFW_windowNoBorder);
1284+
if (!FLAG_IS_SET(CORE.Window.flags, FLAG_WINDOW_RESIZABLE)) FLAG_SET(flags, RGFW_windowNoResize);
1285+
if (FLAG_IS_SET(CORE.Window.flags, FLAG_WINDOW_TRANSPARENT)) FLAG_SET(flags, RGFW_windowTransparent);
1286+
if (FLAG_IS_SET(CORE.Window.flags, FLAG_FULLSCREEN_MODE)) FLAG_SET(flags, RGFW_windowFullscreen);
1287+
if (FLAG_IS_SET(CORE.Window.flags, FLAG_WINDOW_HIDDEN)) FLAG_SET(flags, RGFW_windowHide);
1288+
if (FLAG_IS_SET(CORE.Window.flags, FLAG_WINDOW_MAXIMIZED)) FLAG_SET(flags, RGFW_windowMaximize);
12891289

12901290
// NOTE: Some OpenGL context attributes must be set before window creation
12911291
// Check selection OpenGL version
@@ -1305,9 +1305,9 @@ int InitPlatform(void)
13051305
RGFW_setGLHint(RGFW_glMinor, 3);
13061306
}
13071307

1308-
if (FLAG_CHECK(CORE.Window.flags, FLAG_MSAA_4X_HINT) > 0) RGFW_setGLHint(RGFW_glSamples, 4);
1308+
if (FLAG_IS_SET(CORE.Window.flags, FLAG_MSAA_4X_HINT)) RGFW_setGLHint(RGFW_glSamples, 4);
13091309

1310-
if (!FLAG_CHECK(CORE.Window.flags, FLAG_WINDOW_UNFOCUSED)) FLAG_SET(flags, RGFW_windowFocusOnShow | RGFW_windowFocus);
1310+
if (!FLAG_IS_SET(CORE.Window.flags, FLAG_WINDOW_UNFOCUSED)) FLAG_SET(flags, RGFW_windowFocusOnShow | RGFW_windowFocus);
13111311

13121312
platform.window = RGFW_createWindow(CORE.Window.title, RGFW_RECT(0, 0, CORE.Window.screen.width, CORE.Window.screen.height), flags);
13131313
platform.mon.mode.area.w = 0;
@@ -1331,7 +1331,7 @@ int InitPlatform(void)
13311331
// If so, rcore_desktop_sdl should be updated too
13321332
//SetupFramebuffer(CORE.Window.display.width, CORE.Window.display.height);
13331333

1334-
if (FLAG_CHECK(CORE.Window.flags, FLAG_VSYNC_HINT)) RGFW_window_swapInterval(platform.window, 1);
1334+
if (FLAG_IS_SET(CORE.Window.flags, FLAG_VSYNC_HINT)) RGFW_window_swapInterval(platform.window, 1);
13351335
RGFW_window_makeCurrent(platform.window);
13361336

13371337
// Check surface and context activation

0 commit comments

Comments
 (0)