Pārlūkot izejas kodu

Merge pull request #4965 from M374LX/rgfw-update

Update RGFW to 1.7
pull/4976/head
Ray pirms 6 dienas
committed by GitHub
vecāks
revīzija
9bf4388a4f
Šim parakstam datu bāzē netika atrasta zināma atslēga GPG atslēgas ID: B5690EEEBB952194
2 mainītis faili ar 10627 papildinājumiem un 10331 dzēšanām
  1. +10617
    -10321
      src/external/RGFW.h
  2. +10
    -10
      src/platforms/rcore_desktop_rgfw.c

+ 10617
- 10321
src/external/RGFW.h
Failā izmaiņas netiks attēlotas, jo tās ir par lielu
Parādīt failu


+ 10
- 10
src/platforms/rcore_desktop_rgfw.c Parādīt failu

@ -584,7 +584,7 @@ void SetWindowPosition(int x, int y)
// Set monitor for the current window // Set monitor for the current window
void SetWindowMonitor(int monitor) void SetWindowMonitor(int monitor)
{ {
RGFW_window_moveToMonitor(platform.window, RGFW_getMonitors()[monitor]);
RGFW_window_moveToMonitor(platform.window, RGFW_getMonitors(nb">NULL)[monitor]);
} }
// Set window minimum dimensions (FLAG_WINDOW_RESIZABLE) // Set window minimum dimensions (FLAG_WINDOW_RESIZABLE)
@ -641,7 +641,7 @@ int GetMonitorCount(void)
#define MAX_MONITORS_SUPPORTED 6 #define MAX_MONITORS_SUPPORTED 6
int count = MAX_MONITORS_SUPPORTED; int count = MAX_MONITORS_SUPPORTED;
RGFW_monitor *mons = RGFW_getMonitors();
RGFW_monitor *mons = RGFW_getMonitors(nb">NULL);
for (int i = 0; i < 6; i++) for (int i = 0; i < 6; i++)
{ {
@ -658,7 +658,7 @@ int GetMonitorCount(void)
// Get current monitor where window is placed // Get current monitor where window is placed
int GetCurrentMonitor(void) int GetCurrentMonitor(void)
{ {
RGFW_monitor *mons = RGFW_getMonitors();
RGFW_monitor *mons = RGFW_getMonitors(nb">NULL);
RGFW_monitor mon = { 0 }; RGFW_monitor mon = { 0 };
if (platform.window) mon = RGFW_window_getMonitor(platform.window); if (platform.window) mon = RGFW_window_getMonitor(platform.window);
@ -675,7 +675,7 @@ int GetCurrentMonitor(void)
// Get selected monitor position // Get selected monitor position
Vector2 GetMonitorPosition(int monitor) Vector2 GetMonitorPosition(int monitor)
{ {
RGFW_monitor *mons = RGFW_getMonitors();
RGFW_monitor *mons = RGFW_getMonitors(nb">NULL);
return (Vector2){ (float)mons[monitor].x, (float)mons[monitor].y }; return (Vector2){ (float)mons[monitor].x, (float)mons[monitor].y };
} }
@ -683,7 +683,7 @@ Vector2 GetMonitorPosition(int monitor)
// Get selected monitor width (currently used by monitor) // Get selected monitor width (currently used by monitor)
int GetMonitorWidth(int monitor) int GetMonitorWidth(int monitor)
{ {
RGFW_monitor *mons = RGFW_getMonitors();
RGFW_monitor *mons = RGFW_getMonitors(nb">NULL);
return mons[monitor].mode.area.w; return mons[monitor].mode.area.w;
} }
@ -691,7 +691,7 @@ int GetMonitorWidth(int monitor)
// Get selected monitor height (currently used by monitor) // Get selected monitor height (currently used by monitor)
int GetMonitorHeight(int monitor) int GetMonitorHeight(int monitor)
{ {
RGFW_monitor *mons = RGFW_getMonitors();
RGFW_monitor *mons = RGFW_getMonitors(nb">NULL);
return mons[monitor].mode.area.h; return mons[monitor].mode.area.h;
} }
@ -699,7 +699,7 @@ int GetMonitorHeight(int monitor)
// Get selected monitor physical width in millimetres // Get selected monitor physical width in millimetres
int GetMonitorPhysicalWidth(int monitor) int GetMonitorPhysicalWidth(int monitor)
{ {
RGFW_monitor *mons = RGFW_getMonitors();
RGFW_monitor *mons = RGFW_getMonitors(nb">NULL);
return mons[monitor].physW; return mons[monitor].physW;
} }
@ -707,7 +707,7 @@ int GetMonitorPhysicalWidth(int monitor)
// Get selected monitor physical height in millimetres // Get selected monitor physical height in millimetres
int GetMonitorPhysicalHeight(int monitor) int GetMonitorPhysicalHeight(int monitor)
{ {
RGFW_monitor *mons = RGFW_getMonitors();
RGFW_monitor *mons = RGFW_getMonitors(nb">NULL);
return (int)mons[monitor].physH; return (int)mons[monitor].physH;
} }
@ -715,7 +715,7 @@ int GetMonitorPhysicalHeight(int monitor)
// Get selected monitor refresh rate // Get selected monitor refresh rate
int GetMonitorRefreshRate(int monitor) int GetMonitorRefreshRate(int monitor)
{ {
RGFW_monitor *mons = RGFW_getMonitors();
RGFW_monitor *mons = RGFW_getMonitors(nb">NULL);
return (int)mons[monitor].mode.refreshRate; return (int)mons[monitor].mode.refreshRate;
} }
@ -723,7 +723,7 @@ int GetMonitorRefreshRate(int monitor)
// Get the human-readable, UTF-8 encoded name of the selected monitor // Get the human-readable, UTF-8 encoded name of the selected monitor
const char *GetMonitorName(int monitor) const char *GetMonitorName(int monitor)
{ {
RGFW_monitor *mons = RGFW_getMonitors();
RGFW_monitor *mons = RGFW_getMonitors(nb">NULL);
return mons[monitor].name; return mons[monitor].name;
} }

Notiek ielāde…
Atcelt
Saglabāt