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

Renamed some functions

Browse source 
- Renamed Begin3dMode() --> BeginMode3D()
- Renamed Begin2dMode() --> BeginMode2D()
- Renamed End3dMode() --> EndMode3D()
- Renamed End2dMode() --> EndMode2D()
This commit is contained in:
Ray San 2018-05-04 16:54:05 +02:00
parent 6324697ffd
commit 6045062a05
27 changed files with 60 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

4
examples/core/core_2d_camera.c
View file

@ -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);

4
examples/core/core_3d_camera_first_person.c
View file

@ -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);

4
examples/core/core_3d_camera_free.c
View file

@ -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);

4
examples/core/core_3d_mode.c
View file

@ -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);

4
examples/core/core_3d_picking.c
View file

@ -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);

4
examples/core/core_vr_simulator.c
View file

@ -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();

4
examples/core/core_world_screen.c
View file

@ -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);

4
examples/models/models_billboard.c
View file

@ -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);

4
examples/models/models_box_collisions.c
View file

@ -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);

4
examples/models/models_cubicmap.c
View file

@ -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);

4
examples/models/models_geometric_shapes.c
View file

@ -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);

4
examples/models/models_heightmap.c
View file

@ -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);

4
examples/models/models_material_pbr.c
View file

@ -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);

4
examples/models/models_mesh_generation.c
View file

@ -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));

4
examples/models/models_mesh_picking.c
View file

@ -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);

4
examples/models/models_obj_loading.c
View file

@ -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);

4
examples/models/models_orthographic_projection.c
View file

@ -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);

4
examples/models/models_skybox.c
View file

@ -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);

4
examples/models/models_yaw_pitch_roll.c
View file

@ -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);

4
examples/others/oculus_rift.c
View file

@ -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();

4
examples/others/standard_lighting.c
View file

@ -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);

4
examples/shaders/shaders_custom_uniform.c
View file

@ -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);

4
examples/shaders/shaders_model_shader.c
View file

@ -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);

4
examples/shaders/shaders_postprocessing.c
View file

@ -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)