From 77b59b8ebe02237db90a904a56fa836cd7acbcc8 Mon Sep 17 00:00:00 2001 From: JupiterRider <60042618+JupiterRider@users.noreply.github.com> Date: Sat, 23 Nov 2024 21:48:43 +0100 Subject: [PATCH] GetMouseRay redirects to GetScreenToWorldRay --- raylib/raylib_purego.go | 6 +----- raylib/rcore.go | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/raylib/raylib_purego.go b/raylib/raylib_purego.go index c3ae14e..0d9b0f9 100644 --- a/raylib/raylib_purego.go +++ b/raylib/raylib_purego.go @@ -103,7 +103,6 @@ var setShaderValueV func(shader uintptr, locIndex int32, value []float32, unifor var setShaderValueMatrix func(shader uintptr, locIndex int32, mat uintptr) var setShaderValueTexture func(shader uintptr, locIndex int32, texture uintptr) var unloadShader func(shader uintptr) -var getMouseRay func(ray uintptr, mousePosition uintptr, camera uintptr) var getScreenToWorldRay func(ray uintptr, position uintptr, camera uintptr) var getScreenToWorldRayEx func(ray uintptr, position uintptr, camera uintptr, width, height int32) var getCameraMatrix func(mat uintptr, camera uintptr) @@ -607,7 +606,6 @@ func init() { purego.RegisterLibFunc(&setShaderValueMatrix, raylibDll, "SetShaderValueMatrix") purego.RegisterLibFunc(&setShaderValueTexture, raylibDll, "SetShaderValueTexture") purego.RegisterLibFunc(&unloadShader, raylibDll, "UnloadShader") - purego.RegisterLibFunc(&getMouseRay, raylibDll, "GetMouseRay") purego.RegisterLibFunc(&getScreenToWorldRay, raylibDll, "GetScreenToWorldRay") purego.RegisterLibFunc(&getScreenToWorldRayEx, raylibDll, "GetScreenToWorldRayEx") purego.RegisterLibFunc(&getCameraMatrix, raylibDll, "GetCameraMatrix") @@ -1490,9 +1488,7 @@ func UnloadShader(shader Shader) { // // Deprecated: Use [GetScreenToWorldRay] instead. func GetMouseRay(mousePosition Vector2, camera Camera) Ray { - var ray Ray - getMouseRay(uintptr(unsafe.Pointer(&ray)), *(*uintptr)(unsafe.Pointer(&mousePosition)), uintptr(unsafe.Pointer(&camera))) - return ray + return GetScreenToWorldRay(mousePosition, camera) } // GetScreenToWorldRay - Get a ray trace from screen position (i.e mouse) diff --git a/raylib/rcore.go b/raylib/rcore.go index 392a077..daebe18 100644 --- a/raylib/rcore.go +++ b/raylib/rcore.go @@ -630,11 +630,7 @@ func UnloadShader(shader Shader) { // // Deprecated: Use [GetScreenToWorldRay] instead. func GetMouseRay(mousePosition Vector2, camera Camera) Ray { - cmousePosition := mousePosition.cptr() - ccamera := camera.cptr() - ret := C.GetMouseRay(*cmousePosition, *ccamera) - v := newRayFromPointer(unsafe.Pointer(&ret)) - return v + return GetScreenToWorldRay(mousePosition, camera) } // GetScreenToWorldRay - Get a ray trace from screen position (i.e mouse)