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

Some bugs corrected and trying to implement 3d picking

Browse source
This commit is contained in:
raysan5 2015-08-27 16:10:15 +02:00
parent 9964935a12
commit 04d9c4c183
1 changed files with 22 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/core.c
View file

@ -532,6 +532,7 @@ void Begin3dMode(Camera camera)
double top = 0.1f*tan(45.0f*PI / 360.0f); double top = 0.1f*tan(45.0f*PI / 360.0f);
double right = top*aspect; double right = top*aspect;
// NOTE: zNear and zFar values are important when computing depth buffer values
rlFrustum(-right, right, -top, top, 0.1f, 1000.0f); rlFrustum(-right, right, -top, top, 0.1f, 1000.0f);
rlMatrixMode(RL_MODELVIEW); // Switch back to modelview matrix rlMatrixMode(RL_MODELVIEW); // Switch back to modelview matrix
@ -559,7 +560,7 @@ void End3dMode(void)
// Set target FPS for the game // Set target FPS for the game
void SetTargetFPS(int fps) void SetTargetFPS(int fps)
{ {
targetTime = 1 / (float)fps; targetTime = 1 / (double)fps;
TraceLog(INFO, "Target time per frame: %02.03f milliseconds", (float)targetTime*1000); TraceLog(INFO, "Target time per frame: %02.03f milliseconds", (float)targetTime*1000);
} }
@ -567,16 +568,16 @@ void SetTargetFPS(int fps)
// Returns current FPS // Returns current FPS
float GetFPS(void) float GetFPS(void)
{ {
return (1/(float)frameTime); return (float)(1/frameTime);
} }
// Returns time in seconds for one frame // Returns time in seconds for one frame
float GetFrameTime(void) float GetFrameTime(void)
{ {
// As we are operating quite a lot with frameTime, it could be no stable // As we are operate quite a lot with frameTime,
// so we round it before before passing around to be used // it could be no stable, so we round it before passing it around
// NOTE: There are still problems with high framerates (>500fps) // NOTE: There are still problems with high framerates (>500fps)
double roundedFrameTime = round(frameTime*10000) / 10000; double roundedFrameTime = round(frameTime*10000)/10000;
return (float)roundedFrameTime; // Time in seconds to run a frame return (float)roundedFrameTime; // Time in seconds to run a frame
} }
@ -672,24 +673,28 @@ Ray GetMouseRay(Vector2 mousePosition, Camera camera)
Matrix proj = MatrixIdentity(); Matrix proj = MatrixIdentity();
Matrix view = MatrixLookAt(camera.position, camera.target, camera.up); Matrix view = MatrixLookAt(camera.position, camera.target, camera.up);
// Calculate projection matrix for the camera
float aspect = (GLfloat)GetScreenWidth()/(GLfloat)GetScreenHeight(); float aspect = (GLfloat)GetScreenWidth()/(GLfloat)GetScreenHeight();
double top = 0.1f*tanf(45.0f*PI / 360.0f); double top = 0.1f*tanf(45.0f*PI/360.0f);
double right = top*aspect; double right = top*aspect;
// NOTE: zNear and zFar values are important for depth
proj = MatrixFrustum(-right, right, -top, top, 0.01f, 1000.0f); proj = MatrixFrustum(-right, right, -top, top, 0.01f, 1000.0f);
MatrixTranspose(&proj); MatrixTranspose(&proj);
float realy = (float)GetScreenHeight() - mousePosition.y; // NOTE: Our screen origin is top-left instead of bottom-left: transform required!
float invertedMouseY = (float)GetScreenHeight() - mousePosition.y;
// NOTE: Do I really need to get z value from depth buffer?
//float z; //float z;
// glReadPixels(mousePosition.x, mousePosition.y, 1, 1, GL_DEPTH_COMPONENT, GL_FLOAT, &z); //glReadPixels(mousePosition.x, mousePosition.y, 1, 1, GL_DEPTH_COMPONENT, GL_FLOAT, &z);
//http://www.bfilipek.com/2012/06/select-mouse-opengl.html //http://www.bfilipek.com/2012/06/select-mouse-opengl.html
Vector3 nearPoint = { mousePosition.x, realy, 0.0f }; Vector3 nearPoint = { mousePosition.x, invertedMouseY, 0.0f };
Vector3 farPoint = { mousePosition.x, realy, 1.0f }; Vector3 farPoint = { mousePosition.x, invertedMouseY, 1.0f };
//nearPoint = internalCamera.position; nearPoint = rlglUnproject(nearPoint, proj, view);
farPoint = rlglUnproject(farPoint, proj, view); farPoint = rlglUnproject(farPoint, proj, view); // TODO: it seems it doesn't work...
Vector3 direction = VectorSubtract(farPoint, nearPoint); Vector3 direction = VectorSubtract(farPoint, nearPoint);
VectorNormalize(&direction); VectorNormalize(&direction);
@ -813,7 +818,11 @@ void SetMousePosition(Vector2 position)
// Returns mouse wheel movement Y // Returns mouse wheel movement Y
int GetMouseWheelMove(void) int GetMouseWheelMove(void)
{ {
#if defined(PLATFORM_WEB)
return previousMouseWheelY/100;
#else
return previousMouseWheelY; return previousMouseWheelY;
#endif
} }
// Hide mouse cursor // Hide mouse cursor
@ -1483,7 +1492,7 @@ static double GetTime(void)
clock_gettime(CLOCK_MONOTONIC, &ts); clock_gettime(CLOCK_MONOTONIC, &ts);
uint64_t time = ts.tv_sec*1000000000LLU + (uint64_t)ts.tv_nsec; uint64_t time = ts.tv_sec*1000000000LLU + (uint64_t)ts.tv_nsec;
return (double)(time - baseTime) * 1e-9; return (double)(time - baseTime)*1e-9;
#endif #endif
} }