UnrealXR/raylib
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Manually review previous PR

Browse source
This commit is contained in:
Ray San 2017-12-15 13:44:31 +01:00
parent bcdde6c65a
commit 53ad53d051
6 changed files with 36 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/core.c
View file

@ -153,9 +153,8 @@
//#define GLFW_DLL // Using GLFW DLL on Windows -> No, we use static version!
#if !defined(SUPPORT_BUSY_WAIT_LOOP) && defined(_WIN32)
// NOTE: Those functions require linking with winmm library
unsigned int __stdcall timeBeginPeriod(unsigned int uPeriod);
unsigned int __stdcall timeEndPeriod(unsigned int uPeriod);
__stdcall unsigned int timeBeginPeriod(unsigned int uPeriod);
__stdcall unsigned int timeEndPeriod(unsigned int uPeriod);
#endif
#endif
@ -352,7 +351,7 @@ extern void UnloadDefaultFont(void); // [Module: text] Unloads default fo
static void InitGraphicsDevice(int width, int height); // Initialize graphics device
static void SetupFramebufferSize(int displayWidth, int displayHeight);
static void InitTimer(void); // Initialize timer
double GetTime(void); // Returns time since InitTimer() was run
static double GetTime(void); // Returns time since InitTimer() was run
static void Wait(float ms); // Wait for some milliseconds (stop program execution)
static bool GetKeyStatus(int key); // Returns if a key has been pressed
static bool GetMouseButtonStatus(int button); // Returns if a mouse button has been pressed
@ -413,7 +412,7 @@ static void *GamepadThread(void *arg); // Mouse reading thread
#if defined(PLATFORM_DESKTOP) || defined(PLATFORM_RPI) || defined(PLATFORM_WEB)
// Initialize window and OpenGL context
// NOTE: data parameter could be used to pass any kind of required data to the initialization
void InitRLWindow(int width, int height, void *data)
void InitWindow(int width, int height, void *data)
{
TraceLog(LOG_INFO, "Initializing raylib (v1.9-dev)");
@ -477,7 +476,7 @@ void InitRLWindow(int width, int height, void *data)
#if defined(PLATFORM_ANDROID)
// Initialize window and OpenGL context (and Android activity)
// NOTE: data parameter could be used to pass any kind of required data to the initialization
void InitRLWindow(int width, int height, void *data)
void InitWindow(int width, int height, void *data)
{
TraceLog(LOG_INFO, "Initializing raylib (v1.9-dev)");
@ -538,7 +537,7 @@ void InitRLWindow(int width, int height, void *data)
#endif
// Close window and unload OpenGL context
void CloseRLWindow(void)
void CloseWindow(void)
{
#if defined(SUPPORT_GIF_RECORDING)
if (gifRecording)
@ -715,7 +714,7 @@ int GetScreenHeight(void)
}
// Show mouse cursor
void ShowRLCursor()
void ShowCursor()
{
#if defined(PLATFORM_DESKTOP)
#if defined(__linux__)
@ -728,7 +727,7 @@ void ShowRLCursor()
}
// Hides mouse cursor
void HideRLCursor()
void HideCursor()
{
#if defined(PLATFORM_DESKTOP)
#if defined(__linux__)
@ -1135,7 +1134,7 @@ void SetConfigFlags(char flags)
// Takes a screenshot of current screen (saved a .png)
void TakeScreenshot(const char *fileName)
{
#if (defined(PLATFORM_DESKTOP) || defined(PLATFORM_RPI)) && defined(SUPPORT_SAVE_PNG)
#if defined(PLATFORM_DESKTOP) || defined(PLATFORM_RPI)
unsigned char *imgData = rlReadScreenPixels(renderWidth, renderHeight);
SavePNG(fileName, imgData, renderWidth, renderHeight, 4); // Save image as PNG
free(imgData);
@ -2120,7 +2119,7 @@ static void InitTimer(void)
}
// Get current time measure (in seconds) since InitTimer()
double GetTime(void)
static double GetTime(void)
{
#if defined(PLATFORM_DESKTOP) || defined(PLATFORM_WEB)
return glfwGetTime();