diff options
| author | Ray <raysan5@gmail.com> | 2017-05-17 01:06:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-17 01:06:05 +0200 |
| commit | b6b01f5420935c770e15ca60dd40147d0e5487aa (patch) | |
| tree | ef37651bcfae038ef059e2813413857aec6f7b11 /src | |
| parent | f8a4498a242e685e528bd1ac6d84378947daff7d (diff) | |
| parent | 1e2d3d93fe7808f27a4d1ac1d43133f785694019 (diff) | |
| download | raylib-b6b01f5420935c770e15ca60dd40147d0e5487aa.tar.gz raylib-b6b01f5420935c770e15ca60dd40147d0e5487aa.zip | |
Merge pull request #287 from raysan5/develop
Integrate develop branch
Diffstat (limited to 'src')
| -rw-r--r-- | src/physac.h | 4 | ||||
| -rw-r--r-- | src/raylib.h | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/physac.h b/src/physac.h index b71f2877..d3fdaca4 100644 --- a/src/physac.h +++ b/src/physac.h @@ -246,12 +246,14 @@ PHYSACDEF void ClosePhysics(void); #include <stdlib.h> // Required for: malloc(), free(), srand(), rand() #include <math.h> // Required for: cosf(), sinf(), fabs(), sqrtf() +#include "raymath.h" // Required for: Vector2Add(), Vector2Subtract() + #if defined(_WIN32) // Functions required to query time on Windows int __stdcall QueryPerformanceCounter(unsigned long long int *lpPerformanceCount); int __stdcall QueryPerformanceFrequency(unsigned long long int *lpFrequency); #elif defined(__linux__) || defined(PLATFORM_WEB) - #define _DEFAULT_SOURCE // Enables BSD function definitions and C99 POSIX compliance + //#define _DEFAULT_SOURCE // Enables BSD function definitions and C99 POSIX compliance #include <sys/time.h> // Required for: timespec #include <time.h> // Required for: clock_gettime() #include <stdint.h> diff --git a/src/raylib.h b/src/raylib.h index 203872f0..0b1a6b19 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -473,7 +473,7 @@ typedef struct Ray { Vector3 direction; // Ray direction } Ray; -// Information returned from a raycast +// Raycast hit information typedef struct RayHitInfo { bool hit; // Did the ray hit something? float distance; // Distance to nearest hit @@ -958,7 +958,6 @@ RLAPI void DrawModelWires(Model model, Vector3 position, float scale, Color tint RLAPI void DrawModelWiresEx(Model model, Vector3 position, Vector3 rotationAxis, float rotationAngle, Vector3 scale, Color tint); // Draw a model wires (with texture if set) with extended parameters RLAPI void DrawBoundingBox(BoundingBox box, Color color); // Draw bounding box (wires) - RLAPI void DrawBillboard(Camera camera, Texture2D texture, Vector3 center, float size, Color tint); // Draw a billboard texture RLAPI void DrawBillboardRec(Camera camera, Texture2D texture, Rectangle sourceRec, Vector3 center, float size, Color tint); // Draw a billboard texture defined by sourceRec @@ -1006,9 +1005,9 @@ RLAPI void EndBlendMode(void); // End // VR control functions RLAPI void InitVrSimulator(int vrDevice); // Init VR simulator for selected device RLAPI void CloseVrSimulator(void); // Close VR simulator for current device -RLAPI bool IsVrSimulatorReady(void); // Detect if VR device is ready +RLAPI bool IsVrSimulatorReady(void); // Detect if VR simulator is ready RLAPI void UpdateVrTracking(Camera *camera); // Update VR tracking (position and orientation) and camera -RLAPI void ToggleVrMode(void); // Enable/Disable VR experience (device or simulator) +RLAPI void ToggleVrMode(void); // Enable/Disable VR experience RLAPI void BeginVrDrawing(void); // Begin VR simulator stereo rendering RLAPI void EndVrDrawing(void); // End VR simulator stereo rendering |