diff options
| author | Ray <[email protected]> | 2021-03-19 13:57:24 +0100 |
|---|---|---|
| committer | Ray <[email protected]> | 2021-03-19 13:57:24 +0100 |
| commit | a3a26dd470338605d1ecee7e39f0f5e93d6948d3 (patch) | |
| tree | c9a13533e041ab82a1555bef0c1759371bcf1fec | |
| parent | 4a387acc36af8b6a54883894d1d70779e6ddb457 (diff) | |
| download | raylib.com-a3a26dd470338605d1ecee7e39f0f5e93d6948d3.tar.gz raylib.com-a3a26dd470338605d1ecee7e39f0f5e93d6948d3.zip | |
RENAMED: camera.type to camera.projection
| -rw-r--r-- | examples/web/core/core_3d_camera_first_person.c | 2 | ||||
| -rw-r--r-- | examples/web/core/core_3d_camera_free.c | 2 | ||||
| -rw-r--r-- | examples/web/core/core_3d_camera_mode.c | 2 | ||||
| -rw-r--r-- | examples/web/core/core_quat_conversion.c | 2 | ||||
| -rw-r--r-- | examples/web/core/core_vr_simulator.c | 2 | ||||
| -rw-r--r-- | examples/web/core/core_world_screen.c | 2 | ||||
| -rw-r--r-- | examples/web/models/models_animation.c | 2 | ||||
| -rw-r--r-- | examples/web/models/models_billboard.c | 2 | ||||
| -rw-r--r-- | examples/web/models/models_geometric_shapes.c | 2 | ||||
| -rw-r--r-- | examples/web/models/models_loading.c | 2 | ||||
| -rw-r--r-- | examples/web/models/models_mesh_picking.c | 2 | ||||
| -rw-r--r-- | examples/web/models/models_orthographic_projection.c | 10 |
12 files changed, 16 insertions, 16 deletions
diff --git a/examples/web/core/core_3d_camera_first_person.c b/examples/web/core/core_3d_camera_first_person.c index 52a042b..217346e 100644 --- a/examples/web/core/core_3d_camera_first_person.c +++ b/examples/web/core/core_3d_camera_first_person.c @@ -60,7 +60,7 @@ int main(void) camera.target = (Vector3){ 0.0f, 1.8f, 0.0f }; camera.up = (Vector3){ 0.0f, 1.0f, 0.0f }; camera.fovy = 60.0f; - camera.type = CAMERA_PERSPECTIVE; + camera.projection = CAMERA_PERSPECTIVE; SetCameraMode(camera, CAMERA_FIRST_PERSON); // Set a first person camera mode diff --git a/examples/web/core/core_3d_camera_free.c b/examples/web/core/core_3d_camera_free.c index fdc3d4a..e34d6b7 100644 --- a/examples/web/core/core_3d_camera_free.c +++ b/examples/web/core/core_3d_camera_free.c @@ -44,7 +44,7 @@ int main(void) camera.target = (Vector3){ 0.0f, 0.0f, 0.0f }; // Camera looking at point camera.up = (Vector3){ 0.0f, 1.0f, 0.0f }; // Camera up vector (rotation towards target) camera.fovy = 45.0f; // Camera field-of-view Y - camera.type = CAMERA_PERSPECTIVE; // Camera mode type + camera.projection = CAMERA_PERSPECTIVE; // Camera mode type SetCameraMode(camera, CAMERA_FREE); // Set a free camera mode diff --git a/examples/web/core/core_3d_camera_mode.c b/examples/web/core/core_3d_camera_mode.c index 9f79b6f..9823778 100644 --- a/examples/web/core/core_3d_camera_mode.c +++ b/examples/web/core/core_3d_camera_mode.c @@ -46,7 +46,7 @@ int main(void) camera.target = (Vector3){ 0.0f, 0.0f, 0.0f }; // Camera looking at point camera.up = (Vector3){ 0.0f, 1.0f, 0.0f }; // Camera up vector (rotation towards target) camera.fovy = 45.0f; // Camera field-of-view Y - camera.type = CAMERA_PERSPECTIVE; // Camera mode type + camera.projection = CAMERA_PERSPECTIVE; // Camera mode type #if defined(PLATFORM_WEB) emscripten_set_main_loop(UpdateDrawFrame, 60, 1); diff --git a/examples/web/core/core_quat_conversion.c b/examples/web/core/core_quat_conversion.c index 1ff9f9f..5ce966d 100644 --- a/examples/web/core/core_quat_conversion.c +++ b/examples/web/core/core_quat_conversion.c @@ -56,7 +56,7 @@ int main(void) camera.target = (Vector3){ 0.0f, 0.0f, 0.0f }; // Camera looking at point camera.up = (Vector3){ 0.0f, 1.0f, 0.0f }; // Camera up vector (rotation towards target) camera.fovy = 45.0f; // Camera field-of-view Y - camera.type = CAMERA_PERSPECTIVE; // Camera modele type + camera.projection = CAMERA_PERSPECTIVE; // Camera modele type Mesh mesh = GenMeshCylinder(0.2f, 1.0f, 32); model = LoadModelFromMesh(mesh); diff --git a/examples/web/core/core_vr_simulator.c b/examples/web/core/core_vr_simulator.c index 0e9507e..f514035 100644 --- a/examples/web/core/core_vr_simulator.c +++ b/examples/web/core/core_vr_simulator.c @@ -83,7 +83,7 @@ int main(void) camera.target = (Vector3){ 0.0f, 2.0f, 0.0f }; // Camera looking at point camera.up = (Vector3){ 0.0f, 1.0f, 0.0f }; // Camera up vector (rotation towards target) camera.fovy = 60.0f; // Camera field-of-view Y - camera.type = CAMERA_PERSPECTIVE; // Camera type + camera.projection = CAMERA_PERSPECTIVE; // Camera type SetCameraMode(camera, CAMERA_FIRST_PERSON); // Set first person camera mode diff --git a/examples/web/core/core_world_screen.c b/examples/web/core/core_world_screen.c index 3d4271a..e7eb997 100644 --- a/examples/web/core/core_world_screen.c +++ b/examples/web/core/core_world_screen.c @@ -47,7 +47,7 @@ int main(void) camera.target = (Vector3){ 0.0f, 0.0f, 0.0f }; camera.up = (Vector3){ 0.0f, 1.0f, 0.0f }; camera.fovy = 45.0f; - camera.type = CAMERA_PERSPECTIVE; + camera.projection = CAMERA_PERSPECTIVE; SetCameraMode(camera, CAMERA_FREE); // Set a free camera mode diff --git a/examples/web/models/models_animation.c b/examples/web/models/models_animation.c index 506b89a..1c7bd02 100644 --- a/examples/web/models/models_animation.c +++ b/examples/web/models/models_animation.c @@ -56,7 +56,7 @@ int main(void) camera.target = (Vector3){ 0.0f, 0.0f, 0.0f }; // Camera looking at point camera.up = (Vector3){ 0.0f, 1.0f, 0.0f }; // Camera up vector (rotation towards target) camera.fovy = 45.0f; // Camera field-of-view Y - camera.type = CAMERA_PERSPECTIVE; // Camera mode type + camera.projection = CAMERA_PERSPECTIVE; // Camera mode type model = LoadModel("resources/guy/guy.iqm"); // Load the animated model mesh and basic data texture = LoadTexture("resources/guy/guytex.png"); // Load model texture and set material diff --git a/examples/web/models/models_billboard.c b/examples/web/models/models_billboard.c index 569ccd8..af96569 100644 --- a/examples/web/models/models_billboard.c +++ b/examples/web/models/models_billboard.c @@ -45,7 +45,7 @@ int main(void) camera.target = (Vector3){ 0.0f, 2.0f, 0.0f }; camera.up = (Vector3){ 0.0f, 1.0f, 0.0f }; camera.fovy = 45.0f; - camera.type = CAMERA_PERSPECTIVE; + camera.projection = CAMERA_PERSPECTIVE; bill = LoadTexture("resources/billboard.png"); // Our texture billboard diff --git a/examples/web/models/models_geometric_shapes.c b/examples/web/models/models_geometric_shapes.c index 3ce7b2d..612a19c 100644 --- a/examples/web/models/models_geometric_shapes.c +++ b/examples/web/models/models_geometric_shapes.c @@ -42,7 +42,7 @@ int main(void) camera.target = (Vector3){ 0.0f, 0.0f, 0.0f }; camera.up = (Vector3){ 0.0f, 1.0f, 0.0f }; camera.fovy = 45.0f; - camera.type = CAMERA_PERSPECTIVE; + camera.projection = CAMERA_PERSPECTIVE; #if defined(PLATFORM_WEB) emscripten_set_main_loop(UpdateDrawFrame, 60, 1); diff --git a/examples/web/models/models_loading.c b/examples/web/models/models_loading.c index 54ebcd9..e88c902 100644 --- a/examples/web/models/models_loading.c +++ b/examples/web/models/models_loading.c @@ -62,7 +62,7 @@ int main(void) camera.target = (Vector3){ 0.0f, 10.0f, 0.0f }; // Camera looking at point camera.up = (Vector3){ 0.0f, 1.0f, 0.0f }; // Camera up vector (rotation towards target) camera.fovy = 45.0f; // Camera field-of-view Y - camera.type = CAMERA_PERSPECTIVE; // Camera mode type + camera.projection = CAMERA_PERSPECTIVE; // Camera mode type model = LoadModel("resources/models/castle.obj"); // Load model texture = LoadTexture("resources/models/castle_diffuse.png"); // Load model texture diff --git a/examples/web/models/models_mesh_picking.c b/examples/web/models/models_mesh_picking.c index c73701b..2751918 100644 --- a/examples/web/models/models_mesh_picking.c +++ b/examples/web/models/models_mesh_picking.c @@ -66,7 +66,7 @@ int main(void) camera.target = (Vector3){ 0.0f, 2.3f, 0.0f }; // Camera looking at point camera.up = (Vector3){ 0.0f, 1.6f, 0.0f }; // Camera up vector (rotation towards target) camera.fovy = 45.0f; // Camera field-of-view Y - camera.type = CAMERA_PERSPECTIVE; // Camera mode type + camera.projection = CAMERA_PERSPECTIVE; // Camera mode type tower = LoadModel("resources/models/turret.obj"); // Load OBJ model texture = LoadTexture("resources/models/turret_diffuse.png"); // Load model texture diff --git a/examples/web/models/models_orthographic_projection.c b/examples/web/models/models_orthographic_projection.c index 75dfb75..ec21b8d 100644 --- a/examples/web/models/models_orthographic_projection.c +++ b/examples/web/models/models_orthographic_projection.c @@ -79,15 +79,15 @@ void UpdateDrawFrame(void) //---------------------------------------------------------------------------------- if (IsKeyPressed(KEY_SPACE)) { - if (camera.type == CAMERA_PERSPECTIVE) + if (camera.projection == CAMERA_PERSPECTIVE) { camera.fovy = WIDTH_ORTHOGRAPHIC; - camera.type = CAMERA_ORTHOGRAPHIC; + camera.projection = CAMERA_ORTHOGRAPHIC; } else { camera.fovy = FOVY_PERSPECTIVE; - camera.type = CAMERA_PERSPECTIVE; + camera.projection = CAMERA_PERSPECTIVE; } } //---------------------------------------------------------------------------------- @@ -120,8 +120,8 @@ void UpdateDrawFrame(void) DrawText("Press Spacebar to switch camera type", 10, GetScreenHeight() - 30, 20, DARKGRAY); - if (camera.type == CAMERA_ORTHOGRAPHIC) DrawText("ORTHOGRAPHIC", 10, 40, 20, BLACK); - else if (camera.type == CAMERA_PERSPECTIVE) DrawText("PERSPECTIVE", 10, 40, 20, BLACK); + if (camera.projection == CAMERA_ORTHOGRAPHIC) DrawText("ORTHOGRAPHIC", 10, 40, 20, BLACK); + else if (camera.projection == CAMERA_PERSPECTIVE) DrawText("PERSPECTIVE", 10, 40, 20, BLACK); DrawFPS(10, 10); |
