mirror of
				https://github.com/raysan5/raylib.git
				synced 2025-10-26 12:27:01 +00:00 
			
		
		
		
	Update examples to new camera system
This commit is contained in:
		| @@ -47,7 +47,7 @@ int main() | |||||||
|     { |     { | ||||||
|         // Update |         // Update | ||||||
|         //---------------------------------------------------------------------------------- |         //---------------------------------------------------------------------------------- | ||||||
|         UpdateCamera(&camera);                  // Update camera and player position |         UpdateCamera(&camera);                  // Update camera | ||||||
|         //---------------------------------------------------------------------------------- |         //---------------------------------------------------------------------------------- | ||||||
|  |  | ||||||
|         // Draw |         // Draw | ||||||
|   | |||||||
| @@ -39,7 +39,7 @@ int main() | |||||||
|     { |     { | ||||||
|         // Update |         // Update | ||||||
|         //---------------------------------------------------------------------------------- |         //---------------------------------------------------------------------------------- | ||||||
|         UpdateCamera(&camera);          // Update internal camera and our camera |         UpdateCamera(&camera);          // Update camera | ||||||
|          |          | ||||||
|         if (IsKeyDown('Z')) camera.target = (Vector3){ 0.0f, 0.0f, 0.0f }; |         if (IsKeyDown('Z')) camera.target = (Vector3){ 0.0f, 0.0f, 0.0f }; | ||||||
|         //---------------------------------------------------------------------------------- |         //---------------------------------------------------------------------------------- | ||||||
|   | |||||||
| @@ -22,7 +22,7 @@ int main() | |||||||
|  |  | ||||||
|     // Define the camera to look into our 3d world |     // Define the camera to look into our 3d world | ||||||
|     Camera camera; |     Camera camera; | ||||||
|     camera.position = (Vector3){ 0.0f, 10.0f, 10.0f };  // Camera position |     camera.position = (Vector3){ 10.0f, 10.0f, 10.0f }; // Camera position | ||||||
|     camera.target = (Vector3){ 0.0f, 0.0f, 0.0f };      // Camera looking at point |     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.up = (Vector3){ 0.0f, 1.0f, 0.0f };          // Camera up vector (rotation towards target) | ||||||
|     camera.fovy = 45.0f;                                // Camera field-of-view Y |     camera.fovy = 45.0f;                                // Camera field-of-view Y | ||||||
| @@ -34,9 +34,7 @@ int main() | |||||||
|      |      | ||||||
|     bool collision = false; |     bool collision = false; | ||||||
|      |      | ||||||
|     SetCameraMode(CAMERA_FREE);         // Set a free camera mode |     SetCameraMode(camera, CAMERA_FREE); // Set a free camera mode | ||||||
|     SetCameraPosition(camera.position); // Set internal camera position to match our camera position |  | ||||||
|     SetCameraFovy(camera.fovy);         // Set internal camera field-of-view Y |  | ||||||
|  |  | ||||||
|     SetTargetFPS(60);                   // Set our game to run at 60 frames-per-second |     SetTargetFPS(60);                   // Set our game to run at 60 frames-per-second | ||||||
|     //-------------------------------------------------------------------------------------- |     //-------------------------------------------------------------------------------------- | ||||||
| @@ -46,7 +44,7 @@ int main() | |||||||
|     { |     { | ||||||
|         // Update |         // Update | ||||||
|         //---------------------------------------------------------------------------------- |         //---------------------------------------------------------------------------------- | ||||||
|         UpdateCamera(&camera);          // Update internal camera and our camera |         UpdateCamera(&camera);          // Update camera | ||||||
|          |          | ||||||
|         if (IsMouseButtonPressed(MOUSE_LEFT_BUTTON)) |         if (IsMouseButtonPressed(MOUSE_LEFT_BUTTON)) | ||||||
|         { |         { | ||||||
|   | |||||||
| @@ -30,14 +30,14 @@ int main() | |||||||
|      |      | ||||||
|     // Define the camera to look into our 3d world |     // Define the camera to look into our 3d world | ||||||
|     Camera camera; |     Camera camera; | ||||||
|     camera.position = (Vector3){ 5.0f, 5.0f, 5.0f };    // Camera position |     camera.position = (Vector3){ 5.0f, 2.0f, 5.0f };    // Camera position | ||||||
|     camera.target = (Vector3){ 0.0f, 0.0f, 0.0f };      // Camera looking at point |     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.up = (Vector3){ 0.0f, 1.0f, 0.0f };          // Camera up vector (rotation towards target) | ||||||
|     camera.fovy = 60.0f;                                // Camera field-of-view Y |     camera.fovy = 60.0f;                                // Camera field-of-view Y | ||||||
|      |      | ||||||
|     Vector3 cubePosition = { 0.0f, 0.0f, 0.0f }; |     Vector3 cubePosition = { 0.0f, 0.0f, 0.0f }; | ||||||
|      |      | ||||||
|     SetCameraMode(camera, CAMERA_FIRST_PERSON); |     SetCameraMode(camera, CAMERA_FIRST_PERSON);         // Set first person camera mode | ||||||
|      |      | ||||||
|     SetTargetFPS(90);                   // Set our game to run at 90 frames-per-second |     SetTargetFPS(90);                   // Set our game to run at 90 frames-per-second | ||||||
|     //-------------------------------------------------------------------------------------- |     //-------------------------------------------------------------------------------------- | ||||||
| @@ -47,10 +47,10 @@ int main() | |||||||
|     { |     { | ||||||
|         // Update |         // Update | ||||||
|         //---------------------------------------------------------------------------------- |         //---------------------------------------------------------------------------------- | ||||||
|         if (IsVrSimulator()) UpdateCamera(&camera); |         if (IsVrSimulator()) UpdateCamera(&camera);     // Update camera (simulator mode) | ||||||
|         else UpdateVrTracking(); |         else UpdateVrTracking(&camera);                 // Update camera with device tracking data | ||||||
|          |          | ||||||
|         if (IsKeyPressed(KEY_SPACE)) ToggleVrMode(); |         if (IsKeyPressed(KEY_SPACE)) ToggleVrMode();    // Toggle VR mode | ||||||
|         //---------------------------------------------------------------------------------- |         //---------------------------------------------------------------------------------- | ||||||
|  |  | ||||||
|         // Draw |         // Draw | ||||||
|   | |||||||
| @@ -21,16 +21,13 @@ int main() | |||||||
|     InitWindow(screenWidth, screenHeight, "raylib [core] example - 3d camera free"); |     InitWindow(screenWidth, screenHeight, "raylib [core] example - 3d camera free"); | ||||||
|  |  | ||||||
|     // Define the camera to look into our 3d world |     // Define the camera to look into our 3d world | ||||||
|     Camera camera = {{ 0.0f, 10.0f, 10.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 1.0f, 0.0f }, 45.0f }; |     Camera camera = {{ 10.0f, 10.0f, 10.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 1.0f, 0.0f }, 45.0f }; | ||||||
|  |  | ||||||
|     Vector3 cubePosition = { 0.0f, 0.0f, 0.0f }; |     Vector3 cubePosition = { 0.0f, 0.0f, 0.0f }; | ||||||
|      |      | ||||||
|     Vector2 cubeScreenPosition; |     Vector2 cubeScreenPosition; | ||||||
|      |      | ||||||
|     SetCameraMode(CAMERA_FREE);         // Set a free camera mode |     SetCameraMode(camera, CAMERA_FREE); // Set a free camera mode | ||||||
|     SetCameraPosition(camera.position); // Set internal camera position to match our camera position |  | ||||||
|     SetCameraTarget(camera.target);     // Set internal camera target to match our camera target |  | ||||||
|     SetCameraFovy(camera.fovy);         // Set internal camera field-of-view Y |  | ||||||
|  |  | ||||||
|     SetTargetFPS(60);                   // Set our game to run at 60 frames-per-second |     SetTargetFPS(60);                   // Set our game to run at 60 frames-per-second | ||||||
|     //-------------------------------------------------------------------------------------- |     //-------------------------------------------------------------------------------------- | ||||||
| @@ -40,7 +37,7 @@ int main() | |||||||
|     { |     { | ||||||
|         // Update |         // Update | ||||||
|         //---------------------------------------------------------------------------------- |         //---------------------------------------------------------------------------------- | ||||||
|         UpdateCamera(&camera);          // Update internal camera and our camera |         UpdateCamera(&camera);          // Update camera | ||||||
|          |          | ||||||
|         // Calculate cube screen space position (with a little offset to be in top) |         // Calculate cube screen space position (with a little offset to be in top) | ||||||
|         cubeScreenPosition = GetWorldToScreen((Vector3){cubePosition.x, cubePosition.y + 2.5f, cubePosition.z}, camera); |         cubeScreenPosition = GetWorldToScreen((Vector3){cubePosition.x, cubePosition.y + 2.5f, cubePosition.z}, camera); | ||||||
|   | |||||||
| @@ -26,10 +26,7 @@ int main() | |||||||
|     Texture2D bill = LoadTexture("resources/billboard.png");     // Our texture billboard |     Texture2D bill = LoadTexture("resources/billboard.png");     // Our texture billboard | ||||||
|     Vector3 billPosition = { 0.0f, 2.0f, 0.0f };                 // Position where draw billboard |     Vector3 billPosition = { 0.0f, 2.0f, 0.0f };                 // Position where draw billboard | ||||||
|      |      | ||||||
|     SetCameraMode(CAMERA_ORBITAL);      // Set an orbital camera mode |     SetCameraMode(camera, CAMERA_ORBITAL);  // Set an orbital camera mode | ||||||
|     SetCameraPosition(camera.position); // Set internal camera position to match our camera position |  | ||||||
|     SetCameraTarget(camera.target);     // Set internal camera target to match our camera target |  | ||||||
|     SetCameraFovy(camera.fovy);         // Set internal camera field-of-view Y |  | ||||||
|  |  | ||||||
|     SetTargetFPS(60);                       // Set our game to run at 60 frames-per-second |     SetTargetFPS(60);                       // Set our game to run at 60 frames-per-second | ||||||
|     //-------------------------------------------------------------------------------------- |     //-------------------------------------------------------------------------------------- | ||||||
| @@ -39,7 +36,7 @@ int main() | |||||||
|     { |     { | ||||||
|         // Update |         // Update | ||||||
|         //---------------------------------------------------------------------------------- |         //---------------------------------------------------------------------------------- | ||||||
|         UpdateCamera(&camera);          // Update internal camera and our camera |         UpdateCamera(&camera);              // Update camera | ||||||
|         //---------------------------------------------------------------------------------- |         //---------------------------------------------------------------------------------- | ||||||
|  |  | ||||||
|         // Draw |         // Draw | ||||||
|   | |||||||
| @@ -45,7 +45,7 @@ int main() | |||||||
|     { |     { | ||||||
|         // Update |         // Update | ||||||
|         //---------------------------------------------------------------------------------- |         //---------------------------------------------------------------------------------- | ||||||
|         UpdateCamera(&camera);              // Update internal camera and our camera |         UpdateCamera(&camera);              // Update camera | ||||||
|         //---------------------------------------------------------------------------------- |         //---------------------------------------------------------------------------------- | ||||||
|  |  | ||||||
|         // Draw |         // Draw | ||||||
|   | |||||||
| @@ -31,8 +31,7 @@ int main() | |||||||
|  |  | ||||||
|     UnloadImage(image);                     // Unload heightmap image from RAM, already uploaded to VRAM |     UnloadImage(image);                     // Unload heightmap image from RAM, already uploaded to VRAM | ||||||
|      |      | ||||||
|     SetCameraMode(CAMERA_ORBITAL);      // Set an orbital camera mode |     SetCameraMode(camera, CAMERA_ORBITAL);  // Set an orbital camera mode | ||||||
|     SetCameraPosition(camera.position); // Set internal camera position to match our custom camera position |  | ||||||
|  |  | ||||||
|     SetTargetFPS(60);                       // Set our game to run at 60 frames-per-second |     SetTargetFPS(60);                       // Set our game to run at 60 frames-per-second | ||||||
|     //-------------------------------------------------------------------------------------- |     //-------------------------------------------------------------------------------------- | ||||||
| @@ -42,7 +41,7 @@ int main() | |||||||
|     { |     { | ||||||
|         // Update |         // Update | ||||||
|         //---------------------------------------------------------------------------------- |         //---------------------------------------------------------------------------------- | ||||||
|         UpdateCamera(&camera);          // Update internal camera and our camera |         UpdateCamera(&camera);              // Update camera | ||||||
|         //---------------------------------------------------------------------------------- |         //---------------------------------------------------------------------------------- | ||||||
|  |  | ||||||
|         // Draw |         // Draw | ||||||
|   | |||||||
| @@ -51,9 +51,7 @@ int main() | |||||||
|     RenderTexture2D target = LoadRenderTexture(screenWidth, screenHeight); |     RenderTexture2D target = LoadRenderTexture(screenWidth, screenHeight); | ||||||
|      |      | ||||||
|     // Setup orbital camera |     // Setup orbital camera | ||||||
|     SetCameraMode(CAMERA_ORBITAL);          // Set an orbital camera mode |     SetCameraMode(camera, CAMERA_ORBITAL);  // Set an orbital camera mode | ||||||
|     SetCameraPosition(camera.position);     // Set internal camera position to match our camera position |  | ||||||
|     SetCameraTarget(camera.target);         // Set internal camera target to match our camera target |  | ||||||
|  |  | ||||||
|     SetTargetFPS(60);                       // Set our game to run at 60 frames-per-second |     SetTargetFPS(60);                       // Set our game to run at 60 frames-per-second | ||||||
|     //-------------------------------------------------------------------------------------- |     //-------------------------------------------------------------------------------------- | ||||||
| @@ -71,7 +69,7 @@ int main() | |||||||
|         // Send new value to the shader to be used on drawing |         // Send new value to the shader to be used on drawing | ||||||
|         SetShaderValue(shader, swirlCenterLoc, swirlCenter, 2); |         SetShaderValue(shader, swirlCenterLoc, swirlCenter, 2); | ||||||
|          |          | ||||||
|         UpdateCamera(&camera);              // Update internal camera and our camera |         UpdateCamera(&camera);              // Update camera | ||||||
|         //---------------------------------------------------------------------------------- |         //---------------------------------------------------------------------------------- | ||||||
|  |  | ||||||
|         // Draw |         // Draw | ||||||
|   | |||||||
| @@ -42,7 +42,7 @@ int main() | |||||||
|      |      | ||||||
|     Vector3 position = { 0.0f, 0.0f, 0.0f };    // Set model position |     Vector3 position = { 0.0f, 0.0f, 0.0f };    // Set model position | ||||||
|      |      | ||||||
|     SetCameraMode(camera, CAMERA_ORBITAL);      // Set an orbital camera mode |     SetCameraMode(camera, CAMERA_FREE);      // Set an orbital camera mode | ||||||
|  |  | ||||||
|     SetTargetFPS(60);                           // Set our game to run at 60 frames-per-second |     SetTargetFPS(60);                           // Set our game to run at 60 frames-per-second | ||||||
|     //-------------------------------------------------------------------------------------- |     //-------------------------------------------------------------------------------------- | ||||||
| @@ -71,6 +71,9 @@ int main() | |||||||
|              |              | ||||||
|             DrawText("(c) Dwarf 3D model by David Moreno", screenWidth - 200, screenHeight - 20, 10, GRAY); |             DrawText("(c) Dwarf 3D model by David Moreno", screenWidth - 200, screenHeight - 20, 10, GRAY); | ||||||
|              |              | ||||||
|  |             DrawText(FormatText("Camera position: (%.2f, %.2f, %.2f)", camera.position.x, camera.position.y, camera.position.z), 600, 20, 10, BLACK); | ||||||
|  |             DrawText(FormatText("Camera target: (%.2f, %.2f, %.2f)", camera.target.x, camera.target.y, camera.target.z), 600, 40, 10, GRAY); | ||||||
|  |  | ||||||
|             DrawFPS(10, 10); |             DrawFPS(10, 10); | ||||||
|  |  | ||||||
|         EndDrawing(); |         EndDrawing(); | ||||||
|   | |||||||
| @@ -45,9 +45,7 @@ int main() | |||||||
|     RenderTexture2D target = LoadRenderTexture(screenWidth, screenHeight); |     RenderTexture2D target = LoadRenderTexture(screenWidth, screenHeight); | ||||||
|      |      | ||||||
|     // Setup orbital camera |     // Setup orbital camera | ||||||
|     SetCameraMode(CAMERA_ORBITAL);          // Set an orbital camera mode |     SetCameraMode(camera, CAMERA_ORBITAL);  // Set an orbital camera mode | ||||||
|     SetCameraPosition(camera.position);     // Set internal camera position to match our camera position |  | ||||||
|     SetCameraTarget(camera.target);         // Set internal camera target to match our camera target |  | ||||||
|  |  | ||||||
|     SetTargetFPS(60);                       // Set our game to run at 60 frames-per-second |     SetTargetFPS(60);                       // Set our game to run at 60 frames-per-second | ||||||
|     //-------------------------------------------------------------------------------------- |     //-------------------------------------------------------------------------------------- | ||||||
| @@ -57,7 +55,7 @@ int main() | |||||||
|     { |     { | ||||||
|         // Update |         // Update | ||||||
|         //---------------------------------------------------------------------------------- |         //---------------------------------------------------------------------------------- | ||||||
|         UpdateCamera(&camera);              // Update internal camera and our camera |         UpdateCamera(&camera);              // Update camera | ||||||
|         //---------------------------------------------------------------------------------- |         //---------------------------------------------------------------------------------- | ||||||
|  |  | ||||||
|         // Draw |         // Draw | ||||||
|   | |||||||
| @@ -64,9 +64,7 @@ int main() | |||||||
|     pointLight->radius = 3.0f; |     pointLight->radius = 3.0f; | ||||||
|  |  | ||||||
|     // Setup orbital camera |     // Setup orbital camera | ||||||
|     SetCameraMode(CAMERA_ORBITAL);          // Set an orbital camera mode |     SetCameraMode(camera, CAMERA_ORBITAL);  // Set an orbital camera mode | ||||||
|     SetCameraPosition(camera.position);     // Set internal camera position to match our camera position |  | ||||||
|     SetCameraTarget(camera.target);         // Set internal camera target to match our camera target |  | ||||||
|  |  | ||||||
|     SetTargetFPS(60);                       // Set our game to run at 60 frames-per-second |     SetTargetFPS(60);                       // Set our game to run at 60 frames-per-second | ||||||
|     //-------------------------------------------------------------------------------------- |     //-------------------------------------------------------------------------------------- | ||||||
| @@ -76,7 +74,7 @@ int main() | |||||||
|     { |     { | ||||||
|         // Update |         // Update | ||||||
|         //---------------------------------------------------------------------------------- |         //---------------------------------------------------------------------------------- | ||||||
|         UpdateCamera(&camera);              // Update internal camera and our camera |         UpdateCamera(&camera);              // Update camera | ||||||
|         //---------------------------------------------------------------------------------- |         //---------------------------------------------------------------------------------- | ||||||
|  |  | ||||||
|         // Draw |         // Draw | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 raysan5
					raysan5