From 400097df9d7e27d391736a50e5a53e806a885f54 Mon Sep 17 00:00:00 2001 From: Milan Nikolic Date: Wed, 26 May 2021 12:34:08 +0200 Subject: [PATCH] Rename camera Type->Projection --- examples/core/3d_camera_first_person/main.go | 8 ++++---- examples/core/3d_camera_free/main.go | 2 +- examples/core/3d_picking/main.go | 2 +- examples/models/billboard/main.go | 2 +- examples/models/box_collisions/main.go | 2 +- examples/models/obj_loading/main.go | 2 +- raylib/raylib.go | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/examples/core/3d_camera_first_person/main.go b/examples/core/3d_camera_first_person/main.go index 8ea9c11..5b6d5b3 100644 --- a/examples/core/3d_camera_first_person/main.go +++ b/examples/core/3d_camera_first_person/main.go @@ -16,7 +16,7 @@ func main() { camera.Target = rl.NewVector3(0.0, 1.8, 0.0) camera.Up = rl.NewVector3(0.0, 1.0, 0.0) camera.Fovy = 60.0 - camera.Type = rl.CameraPerspective + camera.Projection = rl.CameraPerspective // Generates some random columns heights := make([]float32, maxColumns) @@ -43,9 +43,9 @@ func main() { rl.BeginMode3D(camera) rl.DrawPlane(rl.NewVector3(0.0, 0.0, 0.0), rl.NewVector2(32.0, 32.0), rl.LightGray) // Draw ground - rl.DrawCube(rl.NewVector3(-16.0, 2.5, 0.0), 1.0, 5.0, 32.0, rl.Blue) // Draw a blue wall - rl.DrawCube(rl.NewVector3(16.0, 2.5, 0.0), 1.0, 5.0, 32.0, rl.Lime) // Draw a green wall - rl.DrawCube(rl.NewVector3(0.0, 2.5, 16.0), 32.0, 5.0, 1.0, rl.Gold) // Draw a yellow wall + rl.DrawCube(rl.NewVector3(-16.0, 2.5, 0.0), 1.0, 5.0, 32.0, rl.Blue) // Draw a blue wall + rl.DrawCube(rl.NewVector3(16.0, 2.5, 0.0), 1.0, 5.0, 32.0, rl.Lime) // Draw a green wall + rl.DrawCube(rl.NewVector3(0.0, 2.5, 16.0), 32.0, 5.0, 1.0, rl.Gold) // Draw a yellow wall // Draw some cubes around for i := 0; i < maxColumns; i++ { diff --git a/examples/core/3d_camera_free/main.go b/examples/core/3d_camera_free/main.go index 3ae7e3c..6dd86d7 100644 --- a/examples/core/3d_camera_free/main.go +++ b/examples/core/3d_camera_free/main.go @@ -12,7 +12,7 @@ func main() { camera.Target = rl.NewVector3(0.0, 0.0, 0.0) camera.Up = rl.NewVector3(0.0, 1.0, 0.0) camera.Fovy = 45.0 - camera.Type = rl.CameraPerspective + camera.Projection = rl.CameraPerspective cubePosition := rl.NewVector3(0.0, 0.0, 0.0) diff --git a/examples/core/3d_picking/main.go b/examples/core/3d_picking/main.go index 4a1bdd6..04832d9 100644 --- a/examples/core/3d_picking/main.go +++ b/examples/core/3d_picking/main.go @@ -15,7 +15,7 @@ func main() { camera.Target = rl.NewVector3(0.0, 0.0, 0.0) camera.Up = rl.NewVector3(0.0, 1.0, 0.0) camera.Fovy = 45.0 - camera.Type = rl.CameraPerspective + camera.Projection = rl.CameraPerspective cubePosition := rl.NewVector3(0.0, 1.0, 0.0) cubeSize := rl.NewVector3(2.0, 2.0, 2.0) diff --git a/examples/models/billboard/main.go b/examples/models/billboard/main.go index 6d20e31..c177938 100644 --- a/examples/models/billboard/main.go +++ b/examples/models/billboard/main.go @@ -15,7 +15,7 @@ func main() { camera.Target = rl.NewVector3(0.0, 2.0, 0.0) camera.Up = rl.NewVector3(0.0, 1.0, 0.0) camera.Fovy = 45.0 - camera.Type = rl.CameraPerspective + camera.Projection = rl.CameraPerspective bill := rl.LoadTexture("billboard.png") // Our texture billboard billPosition := rl.NewVector3(0.0, 2.0, 0.0) // Position where draw billboard diff --git a/examples/models/box_collisions/main.go b/examples/models/box_collisions/main.go index e87a899..596a5d7 100644 --- a/examples/models/box_collisions/main.go +++ b/examples/models/box_collisions/main.go @@ -15,7 +15,7 @@ func main() { camera.Target = rl.NewVector3(0.0, 0.0, 0.0) camera.Up = rl.NewVector3(0.0, 1.0, 0.0) camera.Fovy = 45.0 - camera.Type = rl.CameraPerspective + camera.Projection = rl.CameraPerspective playerPosition := rl.NewVector3(0.0, 1.0, 2.0) playerSize := rl.NewVector3(1.0, 2.0, 1.0) diff --git a/examples/models/obj_loading/main.go b/examples/models/obj_loading/main.go index 42e0fb2..84ee9fc 100644 --- a/examples/models/obj_loading/main.go +++ b/examples/models/obj_loading/main.go @@ -15,7 +15,7 @@ func main() { camera.Target = rl.NewVector3(0.0, 10.0, 0.0) camera.Up = rl.NewVector3(0.0, 1.0, 0.0) camera.Fovy = 45.0 - camera.Type = rl.CameraPerspective + camera.Projection = rl.CameraPerspective obj := rl.LoadModel("castle.obj") // Load OBJ model texture := rl.LoadTexture("castle_diffuse.png") // Load model texture diff --git a/raylib/raylib.go b/raylib/raylib.go index 076f840..78e2419 100644 --- a/raylib/raylib.go +++ b/raylib/raylib.go @@ -618,7 +618,7 @@ type Camera3D struct { // Camera field-of-view apperture in Y (degrees) in perspective, used as near plane width in orthographic Fovy float32 // Camera type, controlling projection type, either CameraPerspective or CameraOrthographic. - Type CameraProjection + Projection CameraProjection } // Camera type fallback, defaults to Camera3D