From 7b91ce25fb8227b3f0cfac31b60e1782c9e992cf Mon Sep 17 00:00:00 2001 From: Milan Nikolic Date: Thu, 11 Nov 2021 16:36:32 +0100 Subject: [PATCH] Update examples --- examples/audio/raw_stream/main.go | 6 +++--- examples/core/2d_paint/main.go | 3 +-- examples/core/3d_picking/main.go | 23 ++++++++++++---------- examples/core/input_gamepad/main.go | 6 +++--- examples/textures/image_generation/main.go | 10 ++-------- examples/textures/image_image/main.go | 4 ++-- examples/textures/image_processing/main.go | 10 +++++----- examples/textures/to_image/main.go | 6 +++--- 8 files changed, 32 insertions(+), 36 deletions(-) diff --git a/examples/audio/raw_stream/main.go b/examples/audio/raw_stream/main.go index d8a9ddf..2f61886 100644 --- a/examples/audio/raw_stream/main.go +++ b/examples/audio/raw_stream/main.go @@ -3,7 +3,7 @@ package main import ( "math" - "github.com/gen2brain/raylib-go/raylib" + rl "github.com/gen2brain/raylib-go/raylib" ) const ( @@ -17,7 +17,7 @@ func main() { rl.InitAudioDevice() // Init raw audio stream (sample rate: 22050, sample size: 32bit-float, channels: 1-mono) - stream := rl.InitAudioStream(22050, 32, 1) + stream := rl.LoadAudioStream(22050, 32, 1) //// Fill audio stream with some samples (sine wave) data := make([]float32, maxSamples) @@ -73,7 +73,7 @@ func main() { rl.EndDrawing() } - rl.CloseAudioStream(stream) // Close raw audio stream and delete buffers from RAM + rl.UnloadAudioStream(stream) // Close raw audio stream and delete buffers from RAM rl.CloseAudioDevice() // Close audio device (music streaming is automatically stopped) diff --git a/examples/core/2d_paint/main.go b/examples/core/2d_paint/main.go index a00ac7d..dba5ff9 100644 --- a/examples/core/2d_paint/main.go +++ b/examples/core/2d_paint/main.go @@ -139,7 +139,7 @@ func main() { } if btnSaveMouseHover && rl.IsMouseButtonReleased(rl.MouseLeftButton) || rl.IsKeyPressed(rl.KeyS) { - image := rl.GetTextureData(target.Texture) + image := rl.LoadImageFromTexture(target.Texture) rl.ImageFlipVertical(*&image) rl.ExportImage(*image, "export.png") rl.UnloadImage(image) @@ -214,4 +214,3 @@ func main() { os.Exit(0) } - diff --git a/examples/core/3d_picking/main.go b/examples/core/3d_picking/main.go index 04832d9..3a2b6ce 100644 --- a/examples/core/3d_picking/main.go +++ b/examples/core/3d_picking/main.go @@ -1,7 +1,7 @@ package main import ( - "github.com/gen2brain/raylib-go/raylib" + rl "github.com/gen2brain/raylib-go/raylib" ) func main() { @@ -21,8 +21,7 @@ func main() { cubeSize := rl.NewVector3(2.0, 2.0, 2.0) var ray rl.Ray - - collision := false + var collision rl.RayCollision rl.SetCameraMode(camera, rl.CameraFree) // Set a free camera mode @@ -32,12 +31,16 @@ func main() { rl.UpdateCamera(&camera) // Update camera if rl.IsMouseButtonPressed(rl.MouseLeftButton) { - ray = rl.GetMouseRay(rl.GetMousePosition(), camera) + if !collision.Hit { + ray = rl.GetMouseRay(rl.GetMousePosition(), camera) - // Check collision between ray and box - min := rl.NewVector3(cubePosition.X-cubeSize.X/2, cubePosition.Y-cubeSize.Y/2, cubePosition.Z-cubeSize.Z/2) - max := rl.NewVector3(cubePosition.X+cubeSize.X/2, cubePosition.Y+cubeSize.Y/2, cubePosition.Z+cubeSize.Z/2) - collision = rl.CheckCollisionRayBox(ray, rl.NewBoundingBox(min, max)) + // Check collision between ray and box + min := rl.NewVector3(cubePosition.X-cubeSize.X/2, cubePosition.Y-cubeSize.Y/2, cubePosition.Z-cubeSize.Z/2) + max := rl.NewVector3(cubePosition.X+cubeSize.X/2, cubePosition.Y+cubeSize.Y/2, cubePosition.Z+cubeSize.Z/2) + collision = rl.GetRayCollisionBox(ray, rl.NewBoundingBox(min, max)) + } else { + collision.Hit = false + } } rl.BeginDrawing() @@ -46,7 +49,7 @@ func main() { rl.BeginMode3D(camera) - if collision { + if collision.Hit { rl.DrawCube(cubePosition, cubeSize.X, cubeSize.Y, cubeSize.Z, rl.Red) rl.DrawCubeWires(cubePosition, cubeSize.X, cubeSize.Y, cubeSize.Z, rl.Maroon) @@ -64,7 +67,7 @@ func main() { rl.DrawText("Try selecting the box with mouse!", 240, 10, 20, rl.DarkGray) - if collision { + if collision.Hit { rl.DrawText("BOX SELECTED", (screenWidth-rl.MeasureText("BOX SELECTED", 30))/2, int32(float32(screenHeight)*0.1), 30, rl.Green) } diff --git a/examples/core/input_gamepad/main.go b/examples/core/input_gamepad/main.go index d4da677..f428ac9 100644 --- a/examples/core/input_gamepad/main.go +++ b/examples/core/input_gamepad/main.go @@ -3,7 +3,7 @@ package main import ( "fmt" - "github.com/gen2brain/raylib-go/raylib" + rl "github.com/gen2brain/raylib-go/raylib" ) const ( @@ -29,7 +29,7 @@ func main() { if rl.IsGamepadAvailable(rl.GamepadPlayer1) { rl.DrawText(fmt.Sprintf("GP1: %s", rl.GetGamepadName(rl.GamepadPlayer1)), 10, 10, 10, rl.Black) - if rl.IsGamepadName(rl.GamepadPlayer1, xbox360NameID) { + if rl.GetGamepadName(rl.GamepadPlayer1) == xbox360NameID { rl.DrawTexture(texXboxPad, 0, 0, rl.DarkGray) // Draw buttons: xbox home @@ -99,7 +99,7 @@ func main() { rl.DrawRectangle(170, 30, 15, int32(((1.0+rl.GetGamepadAxisMovement(rl.GamepadPlayer1, rl.GamepadXboxAxisLt))/2.0)*70), rl.Red) rl.DrawRectangle(604, 30, 15, int32(((1.0+rl.GetGamepadAxisMovement(rl.GamepadPlayer1, rl.GamepadXboxAxisRt))/2.0)*70), rl.Red) - } else if rl.IsGamepadName(rl.GamepadPlayer1, ps3NameID) { + } else if rl.GetGamepadName(rl.GamepadPlayer1) == ps3NameID { rl.DrawTexture(texPs3Pad, 0, 0, rl.DarkGray) // Draw buttons: ps diff --git a/examples/textures/image_generation/main.go b/examples/textures/image_generation/main.go index cab5e9a..f7177c8 100644 --- a/examples/textures/image_generation/main.go +++ b/examples/textures/image_generation/main.go @@ -1,7 +1,7 @@ package main import ( - "github.com/gen2brain/raylib-go/raylib" + rl "github.com/gen2brain/raylib-go/raylib" ) const numTextures = 7 @@ -17,7 +17,6 @@ func main() { radialGradient := rl.GenImageGradientRadial(screenWidth, screenHeight, 0, rl.White, rl.Black) checked := rl.GenImageChecked(screenWidth, screenHeight, 32, 32, rl.Red, rl.Blue) whiteNoise := rl.GenImageWhiteNoise(screenWidth, screenHeight, 0.5) - perlinNoise := rl.GenImagePerlinNoise(screenWidth, screenHeight, 50, 50, 4.0) cellular := rl.GenImageCellular(screenWidth, screenHeight, 32) textures := make([]rl.Texture2D, numTextures) @@ -26,8 +25,7 @@ func main() { textures[2] = rl.LoadTextureFromImage(radialGradient) textures[3] = rl.LoadTextureFromImage(checked) textures[4] = rl.LoadTextureFromImage(whiteNoise) - textures[5] = rl.LoadTextureFromImage(perlinNoise) - textures[6] = rl.LoadTextureFromImage(cellular) + textures[5] = rl.LoadTextureFromImage(cellular) // Unload image data (CPU RAM) rl.UnloadImage(verticalGradient) @@ -35,7 +33,6 @@ func main() { rl.UnloadImage(radialGradient) rl.UnloadImage(checked) rl.UnloadImage(whiteNoise) - rl.UnloadImage(perlinNoise) rl.UnloadImage(cellular) currentTexture := 0 @@ -74,9 +71,6 @@ func main() { rl.DrawText("WHITE NOISE", 640, 10, 20, rl.Red) break case 5: - rl.DrawText("PERLIN NOISE", 630, 10, 20, rl.RayWhite) - break - case 6: rl.DrawText("CELLULAR", 670, 10, 20, rl.RayWhite) break default: diff --git a/examples/textures/image_image/main.go b/examples/textures/image_image/main.go index 24472eb..7b356bd 100644 --- a/examples/textures/image_image/main.go +++ b/examples/textures/image_image/main.go @@ -4,7 +4,7 @@ import ( "image/png" "os" - "github.com/gen2brain/raylib-go/raylib" + rl "github.com/gen2brain/raylib-go/raylib" ) func main() { @@ -35,7 +35,7 @@ func main() { for !rl.WindowShouldClose() { if rl.IsKeyPressed(rl.KeyS) { - rimg := rl.GetTextureData(texture) + rimg := rl.LoadImageFromTexture(texture) f, err := os.Create("image_saved.png") if err != nil { diff --git a/examples/textures/image_processing/main.go b/examples/textures/image_processing/main.go index 5c449a4..d19c1b9 100644 --- a/examples/textures/image_processing/main.go +++ b/examples/textures/image_processing/main.go @@ -1,7 +1,7 @@ package main import ( - "github.com/gen2brain/raylib-go/raylib" + rl "github.com/gen2brain/raylib-go/raylib" ) const numProcesses = 8 @@ -35,9 +35,9 @@ func main() { rl.InitWindow(screenWidth, screenHeight, "raylib [textures] example - image processing") - image := rl.LoadImage("parrots.png") // Loaded in CPU memory (RAM) + image := rl.LoadImage("parrots.png") // Loaded in CPU memory (RAM) rl.ImageFormat(image, rl.UncompressedR8g8b8a8) // Format image to RGBA 32bit (required for texture update) - texture := rl.LoadTextureFromImage(image) // Image converted to texture, GPU memory (VRAM) + texture := rl.LoadTextureFromImage(image) // Image converted to texture, GPU memory (VRAM) currentProcess := None textureReload := false @@ -98,8 +98,8 @@ func main() { break } - pixels := rl.GetImageData(image) // Get pixel data from image (RGBA 32bit) - rl.UpdateTexture(texture, pixels) // Update texture with new image data + pixels := rl.LoadImageColors(image) // Get pixel data from image (RGBA 32bit) + rl.UpdateTexture(texture, pixels) // Update texture with new image data textureReload = false } diff --git a/examples/textures/to_image/main.go b/examples/textures/to_image/main.go index 8a88453..5863090 100644 --- a/examples/textures/to_image/main.go +++ b/examples/textures/to_image/main.go @@ -1,7 +1,7 @@ package main import ( - "github.com/gen2brain/raylib-go/raylib" + rl "github.com/gen2brain/raylib-go/raylib" ) func main() { @@ -14,8 +14,8 @@ func main() { texture := rl.LoadTextureFromImage(image) // Image converted to texture, GPU memory (RAM -> VRAM) rl.UnloadImage(image) // Unload image data from CPU memory (RAM) - image = rl.GetTextureData(texture) // Retrieve image data from GPU memory (VRAM -> RAM) - rl.UnloadTexture(texture) // Unload texture from GPU memory (VRAM) + image = rl.LoadImageFromTexture(texture) // Retrieve image data from GPU memory (VRAM -> RAM) + rl.UnloadTexture(texture) // Unload texture from GPU memory (VRAM) texture = rl.LoadTextureFromImage(image) // Recreate texture from retrieved image data (RAM -> VRAM) rl.UnloadImage(image) // Unload retrieved image data from CPU memory (RAM)