summaryrefslogtreecommitdiffhomepage
path: root/examples
diff options
context:
space:
mode:
authorRay San <[email protected]>2018-05-04 16:54:05 +0200
committerRay San <[email protected]>2018-05-04 16:54:05 +0200
commit6045062a05a0cc5bd654ad2c2e7d88f94579cd73 (patch)
tree33501ec5ce20096821c54329f97189c39d83d79d /examples
parent6324697ffd7fd410274599457dd9f85119510898 (diff)
downloadraylib-6045062a05a0cc5bd654ad2c2e7d88f94579cd73.tar.gz
raylib-6045062a05a0cc5bd654ad2c2e7d88f94579cd73.zip
Renamed some functions
- Renamed Begin3dMode() --> BeginMode3D() - Renamed Begin2dMode() --> BeginMode2D() - Renamed End3dMode() --> EndMode3D() - Renamed End2dMode() --> EndMode2D()
Diffstat (limited to 'examples')
-rw-r--r--examples/core/core_2d_camera.c4
-rw-r--r--examples/core/core_3d_camera_first_person.c4
-rw-r--r--examples/core/core_3d_camera_free.c4
-rw-r--r--examples/core/core_3d_mode.c4
-rw-r--r--examples/core/core_3d_picking.c4
-rw-r--r--examples/core/core_vr_simulator.c4
-rw-r--r--examples/core/core_world_screen.c4
-rw-r--r--examples/models/models_billboard.c4
-rw-r--r--examples/models/models_box_collisions.c4
-rw-r--r--examples/models/models_cubicmap.c4
-rw-r--r--examples/models/models_geometric_shapes.c4
-rw-r--r--examples/models/models_heightmap.c4
-rw-r--r--examples/models/models_material_pbr.c4
-rw-r--r--examples/models/models_mesh_generation.c4
-rw-r--r--examples/models/models_mesh_picking.c4
-rw-r--r--examples/models/models_obj_loading.c4
-rw-r--r--examples/models/models_orthographic_projection.c4
-rw-r--r--examples/models/models_skybox.c4
-rw-r--r--examples/models/models_yaw_pitch_roll.c4
-rw-r--r--examples/others/oculus_rift.c4
-rw-r--r--examples/others/standard_lighting.c4
-rw-r--r--examples/shaders/shaders_custom_uniform.c4
-rw-r--r--examples/shaders/shaders_model_shader.c4
-rw-r--r--examples/shaders/shaders_postprocessing.c4
24 files changed, 48 insertions, 48 deletions
diff --git a/examples/core/core_2d_camera.c b/examples/core/core_2d_camera.c
index f2f219ef..7c35c907 100644
--- a/examples/core/core_2d_camera.c
+++ b/examples/core/core_2d_camera.c
@@ -97,7 +97,7 @@ int main()
ClearBackground(RAYWHITE);
- Begin2dMode(camera);
+ BeginMode2D(camera);
DrawRectangle(-6000, 320, 13000, 8000, DARKGRAY);
@@ -108,7 +108,7 @@ int main()
DrawRectangle(camera.target.x, -500, 1, screenHeight*4, GREEN);
DrawRectangle(-500, camera.target.y, screenWidth*4, 1, GREEN);
- End2dMode();
+ EndMode2D();
DrawText("SCREEN AREA", 640, 10, 20, RED);
diff --git a/examples/core/core_3d_camera_first_person.c b/examples/core/core_3d_camera_first_person.c
index 775e6c57..d3a8f2e4 100644
--- a/examples/core/core_3d_camera_first_person.c
+++ b/examples/core/core_3d_camera_first_person.c
@@ -61,7 +61,7 @@ int main()
ClearBackground(RAYWHITE);
- Begin3dMode(camera);
+ BeginMode3D(camera);
DrawPlane((Vector3){ 0.0f, 0.0f, 0.0f }, (Vector2){ 32.0f, 32.0f }, LIGHTGRAY); // Draw ground
DrawCube((Vector3){ -16.0f, 2.5f, 0.0f }, 1.0f, 5.0f, 32.0f, BLUE); // Draw a blue wall
@@ -75,7 +75,7 @@ int main()
DrawCubeWires(positions[i], 2.0f, heights[i], 2.0f, MAROON);
}
- End3dMode();
+ EndMode3D();
DrawRectangle( 10, 10, 220, 70, Fade(SKYBLUE, 0.5f));
DrawRectangleLines( 10, 10, 220, 70, BLUE);
diff --git a/examples/core/core_3d_camera_free.c b/examples/core/core_3d_camera_free.c
index a583e706..81f04c13 100644
--- a/examples/core/core_3d_camera_free.c
+++ b/examples/core/core_3d_camera_free.c
@@ -50,14 +50,14 @@ int main()
ClearBackground(RAYWHITE);
- Begin3dMode(camera);
+ BeginMode3D(camera);
DrawCube(cubePosition, 2.0f, 2.0f, 2.0f, RED);
DrawCubeWires(cubePosition, 2.0f, 2.0f, 2.0f, MAROON);
DrawGrid(10, 1.0f);
- End3dMode();
+ EndMode3D();
DrawRectangle( 10, 10, 320, 133, Fade(SKYBLUE, 0.5f));
DrawRectangleLines( 10, 10, 320, 133, BLUE);
diff --git a/examples/core/core_3d_mode.c b/examples/core/core_3d_mode.c
index a94ec648..705bcb7a 100644
--- a/examples/core/core_3d_mode.c
+++ b/examples/core/core_3d_mode.c
@@ -46,14 +46,14 @@ int main()
ClearBackground(RAYWHITE);
- Begin3dMode(camera);
+ BeginMode3D(camera);
DrawCube(cubePosition, 2.0f, 2.0f, 2.0f, RED);
DrawCubeWires(cubePosition, 2.0f, 2.0f, 2.0f, MAROON);
DrawGrid(10, 1.0f);
- End3dMode();
+ EndMode3D();
DrawText("Welcome to the third dimension!", 10, 40, 20, DARKGRAY);
diff --git a/examples/core/core_3d_picking.c b/examples/core/core_3d_picking.c
index 56e80f2a..cd390d91 100644
--- a/examples/core/core_3d_picking.c
+++ b/examples/core/core_3d_picking.c
@@ -63,7 +63,7 @@ int main()
ClearBackground(RAYWHITE);
- Begin3dMode(camera);
+ BeginMode3D(camera);
if (collision)
{
@@ -81,7 +81,7 @@ int main()
DrawRay(ray, MAROON);
DrawGrid(10, 1.0f);
- End3dMode();
+ EndMode3D();
DrawText("Try selecting the box with mouse!", 240, 10, 20, DARKGRAY);
diff --git a/examples/core/core_vr_simulator.c b/examples/core/core_vr_simulator.c
index d919c410..35136114 100644
--- a/examples/core/core_vr_simulator.c
+++ b/examples/core/core_vr_simulator.c
@@ -57,14 +57,14 @@ int main()
BeginVrDrawing();
- Begin3dMode(camera);
+ BeginMode3D(camera);
DrawCube(cubePosition, 2.0f, 2.0f, 2.0f, RED);
DrawCubeWires(cubePosition, 2.0f, 2.0f, 2.0f, MAROON);
DrawGrid(40, 1.0f);
- End3dMode();
+ EndMode3D();
EndVrDrawing();
diff --git a/examples/core/core_world_screen.c b/examples/core/core_world_screen.c
index 78ca6eb4..460f6b85 100644
--- a/examples/core/core_world_screen.c
+++ b/examples/core/core_world_screen.c
@@ -54,14 +54,14 @@ int main()
ClearBackground(RAYWHITE);
- Begin3dMode(camera);
+ BeginMode3D(camera);
DrawCube(cubePosition, 2.0f, 2.0f, 2.0f, RED);
DrawCubeWires(cubePosition, 2.0f, 2.0f, 2.0f, MAROON);
DrawGrid(10, 1.0f);
- End3dMode();
+ EndMode3D();
DrawText("Enemy: 100 / 100", cubeScreenPosition.x - MeasureText("Enemy: 100 / 100", 20) / 2, cubeScreenPosition.y, 20, BLACK);
DrawText("Text is always on top of the cube", (screenWidth - MeasureText("Text is always on top of the cube", 20)) / 2, 25, 20, GRAY);
diff --git a/examples/models/models_billboard.c b/examples/models/models_billboard.c
index 3b3efc47..8ce6a44f 100644
--- a/examples/models/models_billboard.c
+++ b/examples/models/models_billboard.c
@@ -51,13 +51,13 @@ int main()
ClearBackground(RAYWHITE);
- Begin3dMode(camera);
+ BeginMode3D(camera);
DrawBillboard(camera, bill, billPosition, 2.0f, WHITE);
DrawGrid(10, 1.0f); // Draw a grid
- End3dMode();
+ EndMode3D();
DrawFPS(10, 10);
diff --git a/examples/models/models_box_collisions.c b/examples/models/models_box_collisions.c
index eb72c54c..41f6056c 100644
--- a/examples/models/models_box_collisions.c
+++ b/examples/models/models_box_collisions.c
@@ -87,7 +87,7 @@ int main()
ClearBackground(RAYWHITE);
- Begin3dMode(camera);
+ BeginMode3D(camera);
// Draw enemy-box
DrawCube(enemyBoxPos, enemyBoxSize.x, enemyBoxSize.y, enemyBoxSize.z, GRAY);
@@ -102,7 +102,7 @@ int main()
DrawGrid(10, 1.0f); // Draw a grid
- End3dMode();
+ EndMode3D();
DrawText("Move player with cursors to collide", 220, 40, 20, GRAY);
diff --git a/examples/models/models_cubicmap.c b/examples/models/models_cubicmap.c
index 47b88748..c8d62c46 100644
--- a/examples/models/models_cubicmap.c
+++ b/examples/models/models_cubicmap.c
@@ -56,11 +56,11 @@ int main()
ClearBackground(RAYWHITE);
- Begin3dMode(camera);
+ BeginMode3D(camera);
DrawModel(model, mapPosition, 1.0f, WHITE);
- End3dMode();
+ EndMode3D();
DrawTextureEx(cubicmap, (Vector2){ screenWidth - cubicmap.width*4 - 20, 20 }, 0.0f, 4.0f, WHITE);
DrawRectangleLines(screenWidth - cubicmap.width*4 - 20, 20, cubicmap.width*4, cubicmap.height*4, GREEN);
diff --git a/examples/models/models_geometric_shapes.c b/examples/models/models_geometric_shapes.c
index 7a1e7e48..82ca4c60 100644
--- a/examples/models/models_geometric_shapes.c
+++ b/examples/models/models_geometric_shapes.c
@@ -45,7 +45,7 @@ int main()
ClearBackground(RAYWHITE);
- Begin3dMode(camera);
+ BeginMode3D(camera);
DrawCube((Vector3){-4.0f, 0.0f, 2.0f}, 2.0f, 5.0f, 2.0f, RED);
DrawCubeWires((Vector3){-4.0f, 0.0f, 2.0f}, 2.0f, 5.0f, 2.0f, GOLD);
@@ -63,7 +63,7 @@ int main()
DrawGrid(10, 1.0f); // Draw a grid
- End3dMode();
+ EndMode3D();
DrawFPS(10, 10);
diff --git a/examples/models/models_heightmap.c b/examples/models/models_heightmap.c
index 55474185..d131b127 100644
--- a/examples/models/models_heightmap.c
+++ b/examples/models/models_heightmap.c
@@ -53,13 +53,13 @@ int main()
ClearBackground(RAYWHITE);
- Begin3dMode(camera);
+ BeginMode3D(camera);
DrawModel(model, mapPosition, 1.0f, RED);
DrawGrid(20, 1.0f);
- End3dMode();
+ EndMode3D();
DrawTexture(texture, screenWidth - texture.width - 20, 20, WHITE);
DrawRectangleLines(screenWidth - texture.width - 20, 20, texture.width, texture.height, GREEN);
diff --git a/examples/models/models_material_pbr.c b/examples/models/models_material_pbr.c
index ee13fddf..33f13e2c 100644
--- a/examples/models/models_material_pbr.c
+++ b/examples/models/models_material_pbr.c
@@ -73,13 +73,13 @@ int main()
ClearBackground(RAYWHITE);
- Begin3dMode(camera);
+ BeginMode3D(camera);
DrawModel(model, Vector3Zero(), 1.0f, WHITE);
DrawGrid(10, 1.0f);
- End3dMode();
+ EndMode3D();
DrawFPS(10, 10);
diff --git a/examples/models/models_mesh_generation.c b/examples/models/models_mesh_generation.c
index d9c28ac2..c02bd91a 100644
--- a/examples/models/models_mesh_generation.c
+++ b/examples/models/models_mesh_generation.c
@@ -72,13 +72,13 @@ int main()
ClearBackground(RAYWHITE);
- Begin3dMode(camera);
+ BeginMode3D(camera);
DrawModel(models[currentModel], position, 1.0f, WHITE);
DrawGrid(10, 1.0);
- End3dMode();
+ EndMode3D();
DrawRectangle(30, 400, 310, 30, Fade(SKYBLUE, 0.5f));
DrawRectangleLines(30, 400, 310, 30, Fade(DARKBLUE, 0.5f));
diff --git a/examples/models/models_mesh_picking.c b/examples/models/models_mesh_picking.c
index e09f9860..17b8812d 100644
--- a/examples/models/models_mesh_picking.c
+++ b/examples/models/models_mesh_picking.c
@@ -120,7 +120,7 @@ int main()
ClearBackground(RAYWHITE);
- Begin3dMode(camera);
+ BeginMode3D(camera);
// Draw the tower
DrawModel(tower, towerPos, 1.0, WHITE);
@@ -151,7 +151,7 @@ int main()
DrawGrid(100, 1.0f);
- End3dMode();
+ EndMode3D();
// Draw some debug GUI text
DrawText(FormatText("Hit Object: %s", hitObjectName), 10, 50, 10, BLACK);
diff --git a/examples/models/models_obj_loading.c b/examples/models/models_obj_loading.c
index 4f89130f..4e9b2986 100644
--- a/examples/models/models_obj_loading.c
+++ b/examples/models/models_obj_loading.c
@@ -50,7 +50,7 @@ int main()
ClearBackground(RAYWHITE);
- Begin3dMode(camera);
+ BeginMode3D(camera);
DrawModel(dwarf, position, 2.0f, WHITE); // Draw 3d model with texture
@@ -58,7 +58,7 @@ int main()
DrawGizmo(position); // Draw gizmo
- End3dMode();
+ EndMode3D();
DrawText("(c) Dwarf 3D model by David Moreno", screenWidth - 200, screenHeight - 20, 10, GRAY);
diff --git a/examples/models/models_orthographic_projection.c b/examples/models/models_orthographic_projection.c
index cb5ea053..f9b54b6d 100644
--- a/examples/models/models_orthographic_projection.c
+++ b/examples/models/models_orthographic_projection.c
@@ -57,7 +57,7 @@ int main()
ClearBackground(RAYWHITE);
- Begin3dMode(camera);
+ BeginMode3D(camera);
DrawCube((Vector3){-4.0f, 0.0f, 2.0f}, 2.0f, 5.0f, 2.0f, RED);
DrawCubeWires((Vector3){-4.0f, 0.0f, 2.0f}, 2.0f, 5.0f, 2.0f, GOLD);
@@ -75,7 +75,7 @@ int main()
DrawGrid(10, 1.0f); // Draw a grid
- End3dMode();
+ EndMode3D();
DrawText("Press Spacebar to switch camera type", 10, GetScreenHeight() - 30, 20, DARKGRAY);
diff --git a/examples/models/models_skybox.c b/examples/models/models_skybox.c
index 700824d3..589f139b 100644
--- a/examples/models/models_skybox.c
+++ b/examples/models/models_skybox.c
@@ -60,13 +60,13 @@ int main()
ClearBackground(RAYWHITE);
- Begin3dMode(camera);
+ BeginMode3D(camera);
DrawModel(skybox, (Vector3){0, 0, 0}, 1.0f, WHITE);
DrawGrid(10, 1.0f);
- End3dMode();
+ EndMode3D();
DrawFPS(10, 10);
diff --git a/examples/models/models_yaw_pitch_roll.c b/examples/models/models_yaw_pitch_roll.c
index c559e67b..0dcf8c70 100644
--- a/examples/models/models_yaw_pitch_roll.c
+++ b/examples/models/models_yaw_pitch_roll.c
@@ -137,12 +137,12 @@ int main()
EndTextureMode();
// Draw 3D model (recomended to draw 3D always before 2D)
- Begin3dMode(camera);
+ BeginMode3D(camera);
DrawModel(model, (Vector3){ 0, 6.0f, 0 }, 1.0f, WHITE); // Draw 3d model with texture
DrawGrid(10, 10.0f);
- End3dMode();
+ EndMode3D();
// Draw 2D GUI stuff
DrawAngleGauge(texAngleGauge, 80, 70, roll, "roll", RED);
diff --git a/examples/others/oculus_rift.c b/examples/others/oculus_rift.c
index af2a87c1..cdfa5f11 100644
--- a/examples/others/oculus_rift.c
+++ b/examples/others/oculus_rift.c
@@ -151,14 +151,14 @@ int main()
if (vrDeviceReady) BeginOculusDrawing();
else BeginVrDrawing();
- Begin3dMode(camera);
+ BeginMode3D(camera);
DrawCube(cubePosition, 2.0f, 2.0f, 2.0f, RED);
DrawCubeWires(cubePosition, 2.0f, 2.0f, 2.0f, MAROON);
DrawGrid(40, 1.0f);
- End3dMode();
+ EndMode3D();
if (vrDeviceReady) EndOculusDrawing();
else EndVrDrawing();
diff --git a/examples/others/standard_lighting.c b/examples/others/standard_lighting.c
index a7f634e2..f450a2a5 100644
--- a/examples/others/standard_lighting.c
+++ b/examples/others/standard_lighting.c
@@ -159,7 +159,7 @@ int main()
ClearBackground(RAYWHITE);
- Begin3dMode(camera);
+ BeginMode3D(camera);
DrawModel(dwarf, position, 2.0f, WHITE); // Draw 3d model with texture
@@ -169,7 +169,7 @@ int main()
DrawGrid(10, 1.0f); // Draw a grid
- End3dMode();
+ EndMode3D();
DrawText("(c) Dwarf 3D model by David Moreno", screenWidth - 200, screenHeight - 20, 10, GRAY);
diff --git a/examples/shaders/shaders_custom_uniform.c b/examples/shaders/shaders_custom_uniform.c
index 4e160455..ddee4187 100644
--- a/examples/shaders/shaders_custom_uniform.c
+++ b/examples/shaders/shaders_custom_uniform.c
@@ -85,13 +85,13 @@ int main()
BeginTextureMode(target); // Enable drawing to texture
- Begin3dMode(camera);
+ BeginMode3D(camera);
DrawModel(dwarf, position, 2.0f, WHITE); // Draw 3d model with texture
DrawGrid(10, 1.0f); // Draw a grid
- End3dMode();
+ EndMode3D();
DrawText("TEXT DRAWN IN RENDER TEXTURE", 200, 10, 30, RED);
diff --git a/examples/shaders/shaders_model_shader.c b/examples/shaders/shaders_model_shader.c
index 51acc836..3ce9c6a3 100644
--- a/examples/shaders/shaders_model_shader.c
+++ b/examples/shaders/shaders_model_shader.c
@@ -66,13 +66,13 @@ int main()
ClearBackground(RAYWHITE);
- Begin3dMode(camera);
+ BeginMode3D(camera);
DrawModel(dwarf, position, 2.0f, WHITE); // Draw 3d model with texture
DrawGrid(10, 1.0f); // Draw a grid
- End3dMode();
+ EndMode3D();
DrawText("(c) Dwarf 3D model by David Moreno", screenWidth - 200, screenHeight - 20, 10, GRAY);
diff --git a/examples/shaders/shaders_postprocessing.c b/examples/shaders/shaders_postprocessing.c
index 5eeda896..80660d68 100644
--- a/examples/shaders/shaders_postprocessing.c
+++ b/examples/shaders/shaders_postprocessing.c
@@ -130,13 +130,13 @@ int main()
BeginTextureMode(target); // Enable drawing to texture
- Begin3dMode(camera);
+ BeginMode3D(camera);
DrawModel(dwarf, position, 2.0f, WHITE); // Draw 3d model with texture
DrawGrid(10, 1.0f); // Draw a grid
- End3dMode();
+ EndMode3D();
EndTextureMode(); // End drawing to texture (now we have a texture available for next passes)