update camera2d to camera

CrackedPixel · Aug 8, 2024 · d1de0bc · d1de0bc
1 parent 747d0d4
commit d1de0bc
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 19 deletions.
diff --git a/examples/core/core_2d_camera.c b/examples/core/core_2d_camera.c
@@ -45,7 +45,7 @@ int main(void)
         buildColors[i] = (Color){ GetRandomValue(200, 240), GetRandomValue(200, 240), GetRandomValue(200, 250), 255 };
     }
 
-    Camera2D camera = { 0 };
+    Camera camera = { 0 };
     camera.target = (Vector2){ player.x + 20.0f, player.y + 20.0f };
     camera.offset = (Vector2){ screenWidth/2.0f, screenHeight/2.0f };
     camera.rotation = 0.0f;

diff --git a/examples/core/core_2d_camera_mouse_zoom.c b/examples/core/core_2d_camera_mouse_zoom.c
@@ -28,7 +28,7 @@ int main ()
 
     InitWindow(screenWidth, screenHeight, "raylib [core] example - 2d camera mouse zoom");
 
-    Camera2D camera = { 0 };
+    Camera camera = { 0 };
     camera.zoom = 1.0f;
 
     int zoomMode = 0;   // 0-Mouse Wheel, 1-Mouse Move

diff --git a/examples/core/core_2d_camera_platformer.c b/examples/core/core_2d_camera_platformer.c
@@ -36,11 +36,11 @@ typedef struct EnvItem {
 // Module functions declaration
 //----------------------------------------------------------------------------------
 void UpdatePlayer(Player *player, EnvItem *envItems, int envItemsLength, float delta);
-void UpdateCameraCenter(Camera2D *camera, Player *player, EnvItem *envItems, int envItemsLength, float delta, int width, int height);
-void UpdateCameraCenterInsideMap(Camera2D *camera, Player *player, EnvItem *envItems, int envItemsLength, float delta, int width, int height);
-void UpdateCameraCenterSmoothFollow(Camera2D *camera, Player *player, EnvItem *envItems, int envItemsLength, float delta, int width, int height);
-void UpdateCameraEvenOutOnLanding(Camera2D *camera, Player *player, EnvItem *envItems, int envItemsLength, float delta, int width, int height);
-void UpdateCameraPlayerBoundsPush(Camera2D *camera, Player *player, EnvItem *envItems, int envItemsLength, float delta, int width, int height);
+void UpdateCameraCenter(Camera *camera, Player *player, EnvItem *envItems, int envItemsLength, float delta, int width, int height);
+void UpdateCameraCenterInsideMap(Camera *camera, Player *player, EnvItem *envItems, int envItemsLength, float delta, int width, int height);
+void UpdateCameraCenterSmoothFollow(Camera *camera, Player *player, EnvItem *envItems, int envItemsLength, float delta, int width, int height);
+void UpdateCameraEvenOutOnLanding(Camera *camera, Player *player, EnvItem *envItems, int envItemsLength, float delta, int width, int height);
+void UpdateCameraPlayerBoundsPush(Camera *camera, Player *player, EnvItem *envItems, int envItemsLength, float delta, int width, int height);
 
 //------------------------------------------------------------------------------------
 // Program main entry point
@@ -68,14 +68,14 @@ int main(void)
 
     int envItemsLength = sizeof(envItems)/sizeof(envItems[0]);
 
-    Camera2D camera = { 0 };
+    Camera camera = { 0 };
     camera.target = player.position;
     camera.offset = (Vector2){ screenWidth/2.0f, screenHeight/2.0f };
     camera.rotation = 0.0f;
     camera.zoom = 1.0f;
 
     // Store pointers to the multiple update camera functions
-    void (*cameraUpdaters[])(Camera2D*, Player*, EnvItem*, int, float, int, int) = {
+    void (*cameraUpdaters[])(Camera*, Player*, EnvItem*, int, float, int, int) = {
         UpdateCameraCenter,
         UpdateCameraCenterInsideMap,
         UpdateCameraCenterSmoothFollow,
@@ -197,13 +197,13 @@ void UpdatePlayer(Player *player, EnvItem *envItems, int envItemsLength, float d
     else player->canJump = true;
 }
 
-void UpdateCameraCenter(Camera2D *camera, Player *player, EnvItem *envItems, int envItemsLength, float delta, int width, int height)
+void UpdateCameraCenter(Camera *camera, Player *player, EnvItem *envItems, int envItemsLength, float delta, int width, int height)
 {
     camera->offset = (Vector2){ width/2.0f, height/2.0f };
     camera->target = player->position;
 }
 
-void UpdateCameraCenterInsideMap(Camera2D *camera, Player *player, EnvItem *envItems, int envItemsLength, float delta, int width, int height)
+void UpdateCameraCenterInsideMap(Camera *camera, Player *player, EnvItem *envItems, int envItemsLength, float delta, int width, int height)
 {
     camera->target = player->position;
     camera->offset = (Vector2){ width/2.0f, height/2.0f };
@@ -227,7 +227,7 @@ void UpdateCameraCenterInsideMap(Camera2D *camera, Player *player, EnvItem *envI
     if (min.y > 0) camera->offset.y = height/2 - min.y;
 }
 
-void UpdateCameraCenterSmoothFollow(Camera2D *camera, Player *player, EnvItem *envItems, int envItemsLength, float delta, int width, int height)
+void UpdateCameraCenterSmoothFollow(Camera *camera, Player *player, EnvItem *envItems, int envItemsLength, float delta, int width, int height)
 {
     static float minSpeed = 30;
     static float minEffectLength = 10;
@@ -244,7 +244,7 @@ void UpdateCameraCenterSmoothFollow(Camera2D *camera, Player *player, EnvItem *e
     }
 }
 
-void UpdateCameraEvenOutOnLanding(Camera2D *camera, Player *player, EnvItem *envItems, int envItemsLength, float delta, int width, int height)
+void UpdateCameraEvenOutOnLanding(Camera *camera, Player *player, EnvItem *envItems, int envItemsLength, float delta, int width, int height)
 {
     static float evenOutSpeed = 700;
     static int eveningOut = false;
@@ -286,7 +286,7 @@ void UpdateCameraEvenOutOnLanding(Camera2D *camera, Player *player, EnvItem *env
     }
 }
 
-void UpdateCameraPlayerBoundsPush(Camera2D *camera, Player *player, EnvItem *envItems, int envItemsLength, float delta, int width, int height)
+void UpdateCameraPlayerBoundsPush(Camera *camera, Player *player, EnvItem *envItems, int envItemsLength, float delta, int width, int height)
 {
     static Vector2 bbox = { 0.2f, 0.2f };
 

diff --git a/examples/core/core_2d_camera_split_screen.c b/examples/core/core_2d_camera_split_screen.c
@@ -35,13 +35,13 @@ int main(void)
     Rectangle player1 = { 200, 200, PLAYER_SIZE, PLAYER_SIZE };
     Rectangle player2 = { 250, 200, PLAYER_SIZE, PLAYER_SIZE };
 
-    Camera2D camera1 = { 0 };
+    Camera camera1 = { 0 };
     camera1.target = (Vector2){ player1.x, player1.y };
     camera1.offset = (Vector2){ 200.0f, 200.0f };
     camera1.rotation = 0.0f;
     camera1.zoom = 1.0f;
 
-    Camera2D camera2 = { 0 };
+    Camera camera2 = { 0 };
     camera2.target = (Vector2){ player2.x, player2.y };
     camera2.offset = (Vector2){ 200.0f, 200.0f };
     camera2.rotation = 0.0f;

diff --git a/examples/core/core_automation_events.c b/examples/core/core_automation_events.c
@@ -63,7 +63,7 @@ int main(void)
     };
 
     // Define camera
-    Camera2D camera = { 0 };
+    Camera camera = { 0 };
     camera.target = player.position;
     camera.offset = (Vector2){ screenWidth/2.0f, screenHeight/2.0f };
     camera.rotation = 0.0f;

diff --git a/examples/core/core_smooth_pixelperfect.c b/examples/core/core_smooth_pixelperfect.c
@@ -35,10 +35,10 @@ int main(void)
 
     InitWindow(screenWidth, screenHeight, "raylib [core] example - smooth pixel-perfect camera");
 
-    Camera2D worldSpaceCamera = { 0 };  // Game world camera
+    Camera worldSpaceCamera = { 0 };  // Game world camera
     worldSpaceCamera.zoom = 1.0f;
 
-    Camera2D screenSpaceCamera = { 0 }; // Smoothing camera
+    Camera screenSpaceCamera = { 0 }; // Smoothing camera
     screenSpaceCamera.zoom = 1.0f;
 
     RenderTexture2D target = LoadRenderTexture(virtualScreenWidth, virtualScreenHeight); // This is where we'll draw all our objects.