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

Review TraceLog() usage

Browse source
This commit is contained in:
raysan5 2017-07-02 12:43:49 +02:00
parent 9f09f6f550
commit c04cb0a65e
2 changed files with 15 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

53
examples/others/oculus_rift.c
View file

@ -40,10 +40,6 @@
//---------------------------------------------------------------------------------- //----------------------------------------------------------------------------------
// Types and Structures Definition // Types and Structures Definition
//---------------------------------------------------------------------------------- //----------------------------------------------------------------------------------
// TraceLog message types
typedef enum { INFO = 0, ERROR, WARNING, DEBUG, OTHER } TraceLogType;
#if defined(RLGL_OCULUS_SUPPORT) #if defined(RLGL_OCULUS_SUPPORT)
// Oculus buffer type // Oculus buffer type
typedef struct OculusBuffer { typedef struct OculusBuffer {
@ -106,8 +102,6 @@ static OculusLayer InitOculusLayer(ovrSession session);
static Matrix FromOvrMatrix(ovrMatrix4f ovrM); // Convert from Oculus ovrMatrix4f struct to raymath Matrix struct static Matrix FromOvrMatrix(ovrMatrix4f ovrM); // Convert from Oculus ovrMatrix4f struct to raymath Matrix struct
#endif #endif
static void TraceLog(int msgType, const char *text, ...);
int main() int main()
{ {
// Initialization // Initialization
@ -229,19 +223,19 @@ static bool InitOculusDevice(void)
result = ovr_Create(&session, &luid); result = ovr_Create(&session, &luid);
if (OVR_FAILURE(result)) if (OVR_FAILURE(result))
{ {
TraceLog(WARNING, "OVR: Could not create Oculus session"); TraceLog(LOG_WARNING, "OVR: Could not create Oculus session");
ovr_Shutdown(); ovr_Shutdown();
} }
else else
{ {
hmdDesc = ovr_GetHmdDesc(session); hmdDesc = ovr_GetHmdDesc(session);
TraceLog(INFO, "OVR: Product Name: %s", hmdDesc.ProductName); TraceLog(LOG_INFO, "OVR: Product Name: %s", hmdDesc.ProductName);
TraceLog(INFO, "OVR: Manufacturer: %s", hmdDesc.Manufacturer); TraceLog(LOG_INFO, "OVR: Manufacturer: %s", hmdDesc.Manufacturer);
TraceLog(INFO, "OVR: Product ID: %i", hmdDesc.ProductId); TraceLog(LOG_INFO, "OVR: Product ID: %i", hmdDesc.ProductId);
TraceLog(INFO, "OVR: Product Type: %i", hmdDesc.Type); TraceLog(LOG_INFO, "OVR: Product Type: %i", hmdDesc.Type);
//TraceLog(INFO, "OVR: Serial Number: %s", hmdDesc.SerialNumber); //TraceLog(LOG_INFO, "OVR: Serial Number: %s", hmdDesc.SerialNumber);
TraceLog(INFO, "OVR: Resolution: %ix%i", hmdDesc.Resolution.w, hmdDesc.Resolution.h); TraceLog(LOG_INFO, "OVR: Resolution: %ix%i", hmdDesc.Resolution.w, hmdDesc.Resolution.h);
// NOTE: Oculus mirror is set to defined screenWidth and screenHeight... // NOTE: Oculus mirror is set to defined screenWidth and screenHeight...
// ...ideally, it should be (hmdDesc.Resolution.w/2, hmdDesc.Resolution.h/2) // ...ideally, it should be (hmdDesc.Resolution.w/2, hmdDesc.Resolution.h/2)
@ -291,7 +285,7 @@ static void UpdateOculusTracking(Camera *camera)
ovrSessionStatus sessionStatus; ovrSessionStatus sessionStatus;
ovr_GetSessionStatus(session, &sessionStatus); ovr_GetSessionStatus(session, &sessionStatus);
if (sessionStatus.ShouldQuit) TraceLog(WARNING, "OVR: Session should quit..."); if (sessionStatus.ShouldQuit) TraceLog(LOG_WARNING, "OVR: Session should quit...");
if (sessionStatus.ShouldRecenter) ovr_RecenterTrackingOrigin(session); if (sessionStatus.ShouldRecenter) ovr_RecenterTrackingOrigin(session);
//if (sessionStatus.HmdPresent) // HMD is present. //if (sessionStatus.HmdPresent) // HMD is present.
//if (sessionStatus.DisplayLost) // HMD was unplugged or the display driver was manually disabled or encountered a TDR. //if (sessionStatus.DisplayLost) // HMD was unplugged or the display driver was manually disabled or encountered a TDR.
@ -349,12 +343,12 @@ static OculusBuffer LoadOculusBuffer(ovrSession session, int width, int height)
ovrResult result = ovr_CreateTextureSwapChainGL(session, &desc, &buffer.textureChain); ovrResult result = ovr_CreateTextureSwapChainGL(session, &desc, &buffer.textureChain);
if (!OVR_SUCCESS(result)) TraceLog(WARNING, "OVR: Failed to create swap textures buffer"); if (!OVR_SUCCESS(result)) TraceLog(LOG_WARNING, "OVR: Failed to create swap textures buffer");
int textureCount = 0; int textureCount = 0;
ovr_GetTextureSwapChainLength(session, buffer.textureChain, &textureCount); ovr_GetTextureSwapChainLength(session, buffer.textureChain, &textureCount);
if (!OVR_SUCCESS(result) || !textureCount) TraceLog(WARNING, "OVR: Unable to count swap chain textures"); if (!OVR_SUCCESS(result) || !textureCount) TraceLog(LOG_WARNING, "OVR: Unable to count swap chain textures");
for (int i = 0; i < textureCount; ++i) for (int i = 0; i < textureCount; ++i)
{ {
@ -420,7 +414,7 @@ static OculusMirror LoadOculusMirror(ovrSession session, int width, int height)
mirrorDesc.Width = mirror.width; mirrorDesc.Width = mirror.width;
mirrorDesc.Height = mirror.height; mirrorDesc.Height = mirror.height;
if (!OVR_SUCCESS(ovr_CreateMirrorTextureGL(session, &mirrorDesc, &mirror.texture))) TraceLog(WARNING, "Could not create mirror texture"); if (!OVR_SUCCESS(ovr_CreateMirrorTextureGL(session, &mirrorDesc, &mirror.texture))) TraceLog(LOG_WARNING, "Could not create mirror texture");
glGenFramebuffers(1, &mirror.fboId); glGenFramebuffers(1, &mirror.fboId);
@ -511,28 +505,3 @@ static Matrix FromOvrMatrix(ovrMatrix4f ovrmat)
return rmat; return rmat;
} }
#endif #endif
// Output a trace log message
// NOTE: Expected msgType: (0)Info, (1)Error, (2)Warning
static void TraceLog(int msgType, const char *text, ...)
{
va_list args;
va_start(args, text);
switch (msgType)
{
case INFO: fprintf(stdout, "INFO: "); break;
case ERROR: fprintf(stdout, "ERROR: "); break;
case WARNING: fprintf(stdout, "WARNING: "); break;
case DEBUG: fprintf(stdout, "DEBUG: "); break;
default: break;
}
vfprintf(stdout, text, args);
fprintf(stdout, "\n");
va_end(args);
if (msgType == ERROR) exit(1);
}

8
examples/others/rlgl_standalone.c
View file

@ -62,10 +62,10 @@ int main(void)
if (!glfwInit()) if (!glfwInit())
{ {
TraceLog(WARNING, "GLFW3: Can not initialize GLFW"); TraceLog(LOG_WARNING, "GLFW3: Can not initialize GLFW");
return 1; return 1;
} }
else TraceLog(INFO, "GLFW3: GLFW initialized successfully"); else TraceLog(LOG_INFO, "GLFW3: GLFW initialized successfully");
glfwWindowHint(GLFW_SAMPLES, 4); glfwWindowHint(GLFW_SAMPLES, 4);
glfwWindowHint(GLFW_DEPTH_BITS, 16); glfwWindowHint(GLFW_DEPTH_BITS, 16);
@ -81,7 +81,7 @@ int main(void)
glfwTerminate(); glfwTerminate();
return 2; return 2;
} }
else TraceLog(INFO, "GLFW3: Window created successfully"); else TraceLog(LOG_INFO, "GLFW3: Window created successfully");
glfwSetWindowPos(window, 200, 200); glfwSetWindowPos(window, 200, 200);
@ -190,7 +190,7 @@ int main(void)
// GLFW3: Error callback // GLFW3: Error callback
static void ErrorCallback(int error, const char* description) static void ErrorCallback(int error, const char* description)
{ {
TraceLog(ERROR, description); TraceLog(LOG_ERROR, description);
} }
// GLFW3: Keyboard callback // GLFW3: Keyboard callback