diff --git a/examples/core/drop_files/main.go b/examples/core/drop_files/main.go index 91a98d8..38e0245 100644 --- a/examples/core/drop_files/main.go +++ b/examples/core/drop_files/main.go @@ -12,12 +12,13 @@ func main() { rl.SetTargetFPS(60) - count := int32(0) + var count int var droppedFiles []string for !rl.WindowShouldClose() { if rl.IsFileDropped() { - droppedFiles = rl.GetDroppedFiles(&count) + droppedFiles = rl.LoadDroppedFiles() + count = len(droppedFiles) } rl.BeginDrawing() @@ -28,7 +29,7 @@ func main() { } else { rl.DrawText("Dropped files:", 100, 40, 20, rl.DarkGray) - for i := int32(0); i < count; i++ { + for i := 0; i < count; i++ { if i%2 == 0 { rl.DrawRectangle(0, int32(85+40*i), screenWidth, 40, rl.Fade(rl.LightGray, 0.5)) } else { @@ -44,7 +45,7 @@ func main() { rl.EndDrawing() } - rl.ClearDroppedFiles() + rl.UnloadDroppedFiles() rl.CloseWindow() } diff --git a/examples/core/storage_values/main.go b/examples/core/storage_values/main.go deleted file mode 100644 index 4b5f19d..0000000 --- a/examples/core/storage_values/main.go +++ /dev/null @@ -1,58 +0,0 @@ -package main - -import ( - "fmt" - - "github.com/gen2brain/raylib-go/raylib" -) - -const ( - storageScore = 0 - storageHiscore = 1 -) - -func main() { - rl.InitWindow(800, 450, "raylib [core] example - storage save/load values") - - score := int32(0) - hiscore := int32(0) - - framesCounter := 0 - - rl.SetTargetFPS(60) - - for !rl.WindowShouldClose() { - if rl.IsKeyPressed(rl.KeyR) { - score = rl.GetRandomValue(1000, 2000) - hiscore = rl.GetRandomValue(2000, 4000) - } - - if rl.IsKeyPressed(rl.KeyEnter) { - rl.SaveStorageValue(storageScore, score) - rl.SaveStorageValue(storageHiscore, hiscore) - } else if rl.IsKeyPressed(rl.KeySpace) { - // NOTE: If requested position could not be found, value 0 is returned - score = rl.LoadStorageValue(storageScore) - hiscore = rl.LoadStorageValue(storageHiscore) - } - - framesCounter++ - - rl.BeginDrawing() - - rl.ClearBackground(rl.RayWhite) - - rl.DrawText(fmt.Sprintf("SCORE: %d", score), 280, 130, 40, rl.Maroon) - rl.DrawText(fmt.Sprintf("HI-SCORE: %d", hiscore), 210, 200, 50, rl.Black) - - rl.DrawText(fmt.Sprintf("frames: %d", framesCounter), 10, 10, 20, rl.Lime) - - rl.DrawText("Press R to generate random numbers", 220, 40, 20, rl.LightGray) - rl.DrawText("Press ENTER to SAVE values", 250, 310, 20, rl.LightGray) - rl.DrawText("Press SPACE to LOAD values", 252, 350, 20, rl.LightGray) - - rl.EndDrawing() - } - - rl.CloseWindow() -} diff --git a/raylib/platform_android.go b/raylib/platform_android.go index 2c09d35..d50dcaf 100644 --- a/raylib/platform_android.go +++ b/raylib/platform_android.go @@ -83,13 +83,13 @@ func IsFileDropped() bool { return false } -// GetDroppedFiles - Retrieve dropped files into window -func GetDroppedFiles(count *int32) (files []string) { +// LoadDroppedFiles - Load dropped filepaths +func LoadDroppedFiles() (files []string) { return } -// ClearDroppedFiles - Clear dropped files paths buffer -func ClearDroppedFiles() { +// UnloadDroppedFiles - Unload dropped filepaths +func UnloadDroppedFiles() { return } diff --git a/raylib/platform_desktop.go b/raylib/platform_desktop.go index d5873b6..8b4e146 100644 --- a/raylib/platform_desktop.go +++ b/raylib/platform_desktop.go @@ -71,13 +71,13 @@ func IsFileDropped() bool { return v } -// GetDroppedFiles - Retrieve dropped files into window -func GetDroppedFiles(count *int32) []string { - ccount := (*C.int)(unsafe.Pointer(count)) - ret := C.GetDroppedFiles(ccount) +// LoadDroppedFiles - Load dropped filepaths +func LoadDroppedFiles() []string { + ret := C.LoadDroppedFiles() + defer C.UnloadDroppedFiles(ret) - tmpslice := (*[1 << 24]*C.char)(unsafe.Pointer(ret))[:*count:*count] - gostrings := make([]string, *count) + tmpslice := (*[1 << 24]*C.char)(unsafe.Pointer(ret.paths))[:ret.count:ret.count] + gostrings := make([]string, ret.count) for i, s := range tmpslice { gostrings[i] = C.GoString(s) } @@ -85,9 +85,9 @@ func GetDroppedFiles(count *int32) []string { return gostrings } -// ClearDroppedFiles - Clear dropped files paths buffer -func ClearDroppedFiles() { - C.ClearDroppedFiles() +// UnloadDroppedFiles - Unload dropped filepaths +func UnloadDroppedFiles() { + return } // OpenAsset - Open asset diff --git a/raylib/platform_drm.go b/raylib/platform_drm.go index 5551956..1fb8d21 100644 --- a/raylib/platform_drm.go +++ b/raylib/platform_drm.go @@ -69,13 +69,13 @@ func IsFileDropped() bool { return false } -// GetDroppedFiles - Retrieve dropped files into window -func GetDroppedFiles(count *int32) (files []string) { +// LoadDroppedFiles - Load dropped filepaths +func LoadDroppedFiles() (files []string) { return } -// ClearDroppedFiles - Clear dropped files paths buffer -func ClearDroppedFiles() { +// UnloadDroppedFiles - Unload dropped filepaths +func UnloadDroppedFiles() { return } diff --git a/raylib/platform_rpi.go b/raylib/platform_rpi.go index b67d394..aa61ffb 100644 --- a/raylib/platform_rpi.go +++ b/raylib/platform_rpi.go @@ -69,13 +69,13 @@ func IsFileDropped() bool { return false } -// GetDroppedFiles - Retrieve dropped files into window -func GetDroppedFiles(count *int32) (files []string) { +// LoadDroppedFiles - Load dropped filepaths +func LoadDroppedFiles() (files []string) { return } -// ClearDroppedFiles - Clear dropped files paths buffer -func ClearDroppedFiles() { +// UnloadDroppedFiles - Unload dropped filepaths +func UnloadDroppedFiles() { return } diff --git a/raylib/raudio.go b/raylib/raudio.go index 362bb7d..d59a6c3 100644 --- a/raylib/raudio.go +++ b/raylib/raudio.go @@ -213,8 +213,8 @@ func LoadWaveSamples(wave Wave) []float32 { ret := C.LoadWaveSamples(*cwave) sliceHeader := (*reflect.SliceHeader)((unsafe.Pointer(&data))) - sliceHeader.Cap = int(wave.SampleCount) - sliceHeader.Len = int(wave.SampleCount) + sliceHeader.Cap = int(wave.FrameCount) + sliceHeader.Len = int(wave.FrameCount) sliceHeader.Data = uintptr(unsafe.Pointer(ret)) return data diff --git a/raylib/raylib.go b/raylib/raylib.go index e3da088..9eaf01f 100644 --- a/raylib/raylib.go +++ b/raylib/raylib.go @@ -30,8 +30,6 @@ Example: rl.CloseWindow() } - - */ package rl @@ -56,7 +54,7 @@ func init() { // Wave type, defines audio wave data type Wave struct { // Number of samples - SampleCount uint32 + FrameCount uint32 // Frequency (samples per second) SampleRate uint32 // Bit depth (bits per sample): 8, 16, 32 (24 not supported) @@ -80,9 +78,9 @@ func newWaveFromPointer(ptr unsafe.Pointer) Wave { // Sound source type type Sound struct { - Stream AudioStream - SampleCount uint32 - _ [4]byte + Stream AudioStream + FrameCount uint32 + _ [4]byte } // newSoundFromPointer - Returns new Sound from pointer @@ -93,11 +91,11 @@ func newSoundFromPointer(ptr unsafe.Pointer) Sound { // Music type (file streaming from memory) // NOTE: Anything longer than ~10 seconds should be streamed type Music struct { - Stream AudioStream - SampleCount uint32 - Looping bool - CtxType int32 - CtxData unsafe.Pointer + Stream AudioStream + FrameCount uint32 + Looping bool + CtxType int32 + CtxData unsafe.Pointer } // newMusicFromPointer - Returns new Music from pointer @@ -110,6 +108,8 @@ func newMusicFromPointer(ptr unsafe.Pointer) Music { type AudioStream struct { // Buffer Buffer *C.rAudioBuffer + // Processor + Processor *C.rAudioProcessor // Frequency (samples per second) SampleRate uint32 // Bit depth (bits per sample): 8, 16, 32 (24 not supported) diff --git a/raylib/rcore.go b/raylib/rcore.go index 84ce3dd..ba565d5 100644 --- a/raylib/rcore.go +++ b/raylib/rcore.go @@ -595,21 +595,6 @@ func TakeScreenshot(name string) { C.TakeScreenshot(cname) } -// SaveStorageValue - Storage save integer value (to defined position) -func SaveStorageValue(position, value int32) { - cposition := (C.uint)(position) - cvalue := (C.int)(value) - C.SaveStorageValue(cposition, cvalue) -} - -// LoadStorageValue - Storage load integer value (from defined position) -func LoadStorageValue(position int32) int32 { - cposition := (C.uint)(position) - ret := C.LoadStorageValue(cposition) - v := (int32)(ret) - return v -} - // IsKeyPressed - Detect if a key has been pressed once func IsKeyPressed(key int32) bool { ckey := (C.int)(key) diff --git a/raylib/rmodels.go b/raylib/rmodels.go index 1e7165d..4ea40ee 100644 --- a/raylib/rmodels.go +++ b/raylib/rmodels.go @@ -558,15 +558,6 @@ func GetRayCollisionBox(ray Ray, box BoundingBox) RayCollision { return v } -// GetRayCollisionModel - Get collision info between ray and model -func GetRayCollisionModel(ray Ray, model Model) RayCollision { - cray := ray.cptr() - cmodel := model.cptr() - ret := C.GetRayCollisionModel(*cray, *cmodel) - v := newRayCollisionFromPointer(unsafe.Pointer(&ret)) - return v -} - // GetRayCollisionMesh - Get collision info between ray and mesh func GetRayCollisionMesh(ray Ray, mesh Mesh, transform Matrix) RayCollision { cray := ray.cptr()