From 962c3b5be2910e3a6be438d073eae23f43635d1d Mon Sep 17 00:00:00 2001 From: Antonis Geralis Date: Thu, 21 Nov 2024 23:38:21 +0200 Subject: [PATCH 1/2] Rename kind to avoid ambiguous ident errors --- src/raylib.nim | 50 ++++++++++++------------- tools/wrapper/snippets/raylib_funcs.nim | 50 ++++++++++++------------- 2 files changed, 50 insertions(+), 50 deletions(-) diff --git a/src/raylib.nim b/src/raylib.nim index c81c4cb..b9ff234 100644 --- a/src/raylib.nim +++ b/src/raylib.nim @@ -2528,27 +2528,27 @@ proc exportDataAsCode*(data: openArray[byte], fileName: string): bool = type ShaderV* = concept - proc kind(x: typedesc[Self]): ShaderUniformDataType - -template kind*(x: typedesc[float32]): ShaderUniformDataType = Float -template kind*(x: typedesc[Vector2]): ShaderUniformDataType = Vec2 -template kind*(x: typedesc[Vector3]): ShaderUniformDataType = Vec3 -template kind*(x: typedesc[Vector4]): ShaderUniformDataType = Vec4 -template kind*(x: typedesc[int32]): ShaderUniformDataType = Int -template kind*(x: typedesc[array[2, int32]]): ShaderUniformDataType = Ivec2 -template kind*(x: typedesc[array[3, int32]]): ShaderUniformDataType = Ivec3 -template kind*(x: typedesc[array[4, int32]]): ShaderUniformDataType = Ivec4 -template kind*(x: typedesc[array[2, float32]]): ShaderUniformDataType = Vec2 -template kind*(x: typedesc[array[3, float32]]): ShaderUniformDataType = Vec3 -template kind*(x: typedesc[array[4, float32]]): ShaderUniformDataType = Vec4 + proc shaderKind(x: typedesc[Self]): ShaderUniformDataType + +template shaderKind*(x: typedesc[float32]): ShaderUniformDataType = Float +template shaderKind*(x: typedesc[Vector2]): ShaderUniformDataType = Vec2 +template shaderKind*(x: typedesc[Vector3]): ShaderUniformDataType = Vec3 +template shaderKind*(x: typedesc[Vector4]): ShaderUniformDataType = Vec4 +template shaderKind*(x: typedesc[int32]): ShaderUniformDataType = Int +template shaderKind*(x: typedesc[array[2, int32]]): ShaderUniformDataType = Ivec2 +template shaderKind*(x: typedesc[array[3, int32]]): ShaderUniformDataType = Ivec3 +template shaderKind*(x: typedesc[array[4, int32]]): ShaderUniformDataType = Ivec4 +template shaderKind*(x: typedesc[array[2, float32]]): ShaderUniformDataType = Vec2 +template shaderKind*(x: typedesc[array[3, float32]]): ShaderUniformDataType = Vec3 +template shaderKind*(x: typedesc[array[4, float32]]): ShaderUniformDataType = Vec4 proc setShaderValue*[T: ShaderV](shader: Shader, locIndex: ShaderLocation, value: T) = ## Set shader uniform value - setShaderValueImpl(shader, locIndex, addr value, kind(T)) + setShaderValueImpl(shader, locIndex, addr value, shaderKind(T)) proc setShaderValueV*[T: ShaderV](shader: Shader, locIndex: ShaderLocation, value: openArray[T]) = ## Set shader uniform value vector - setShaderValueVImpl(shader, locIndex, cast[pointer](value), kind(T), value.len.int32) + setShaderValueVImpl(shader, locIndex, cast[pointer](value), shaderKind(T), value.len.int32) proc loadModelAnimations*(fileName: string): RArray[ModelAnimation] = ## Load model animations from file @@ -2622,9 +2622,9 @@ proc exportImageToMemory*(image: Image, fileType: string): RArray[uint8] = type Pixel* = concept - proc kind(x: typedesc[Self]): PixelFormat + proc pixelKind(x: typedesc[Self]): PixelFormat -template kind*(x: typedesc[Color]): PixelFormat = UncompressedR8g8b8a8 +template pixelKind*(x: typedesc[Color]): PixelFormat = UncompressedR8g8b8a8 template toColorArray*(a: openArray[byte]): untyped = ## Note: that `a` should be properly formatted, with a byte representation that aligns @@ -2636,10 +2636,10 @@ template toColorArray*(a: openArray[byte]): untyped = proc loadTextureFromData*[T: Pixel](pixels: openArray[T], width: int32, height: int32): Texture = ## Load texture using pixels - assert getPixelDataSize(width, height, kind(T)) == pixels.len*sizeof(T), + assert getPixelDataSize(width, height, pixelKind(T)) == pixels.len*sizeof(T), "Mismatch between expected and actual data size" let image = Image(data: cast[pointer](pixels), width: width, height: height, - format: kind(T), mipmaps: 1).WeakImage + format: pixelKind(T), mipmaps: 1).WeakImage result = loadTextureFromImageImpl(image.Image) if not isTextureValid(result): raiseRaylibError("Failed to load Texture from buffer") @@ -2665,27 +2665,27 @@ proc loadRenderTexture*(width: int32, height: int32): RenderTexture2D = proc updateTexture*[T: Pixel](texture: Texture2D, pixels: openArray[T]) = ## Update GPU texture with new data - assert texture.format == kind(T), "Incompatible texture format" + assert texture.format == pixelKind(T), "Incompatible texture format" assert getPixelDataSize(texture.width, texture.height, texture.format) == pixels.len*sizeof(T), "Mismatch between expected and actual data size" updateTextureImpl(texture, cast[pointer](pixels)) proc updateTexture*[T: Pixel](texture: Texture2D, rec: Rectangle, pixels: openArray[T]) = ## Update GPU texture rectangle with new data - assert texture.format == kind(T), "Incompatible texture format" + assert texture.format == pixelKind(T), "Incompatible texture format" assert getPixelDataSize(rec.width.int32, rec.height.int32, texture.format) == pixels.len*sizeof(T), "Mismatch between expected and actual data size" updateTextureImpl(texture, rec, cast[pointer](pixels)) proc getPixelColor*[T: Pixel](pixel: T): Color = ## Get Color from a source pixel pointer of certain format - assert getPixelDataSize(1, 1, kind(T)) == sizeof(T), "Pixel size does not match expected format" - getPixelColorImpl(addr pixel, kind(T)) + assert getPixelDataSize(1, 1, pixelKind(T)) == sizeof(T), "Pixel size does not match expected format" + getPixelColorImpl(addr pixel, pixelKind(T)) proc setPixelColor*[T: Pixel](pixel: var T, color: Color) = ## Set color formatted into destination pixel pointer - assert getPixelDataSize(1, 1, kind(T)) == sizeof(T), "Pixel size does not match expected format" - setPixelColorImpl(addr pixel, color, kind(T)) + assert getPixelDataSize(1, 1, pixelKind(T)) == sizeof(T), "Pixel size does not match expected format" + setPixelColorImpl(addr pixel, color, pixelKind(T)) proc loadFontData*(fileData: openArray[uint8]; fontSize: int32; codepoints: openArray[int32]; `type`: FontType): RArray[GlyphInfo] = diff --git a/tools/wrapper/snippets/raylib_funcs.nim b/tools/wrapper/snippets/raylib_funcs.nim index 25c6dc8..31e3579 100644 --- a/tools/wrapper/snippets/raylib_funcs.nim +++ b/tools/wrapper/snippets/raylib_funcs.nim @@ -76,27 +76,27 @@ proc exportDataAsCode*(data: openArray[byte], fileName: string): bool = type ShaderV* = concept - proc kind(x: typedesc[Self]): ShaderUniformDataType - -template kind*(x: typedesc[float32]): ShaderUniformDataType = Float -template kind*(x: typedesc[Vector2]): ShaderUniformDataType = Vec2 -template kind*(x: typedesc[Vector3]): ShaderUniformDataType = Vec3 -template kind*(x: typedesc[Vector4]): ShaderUniformDataType = Vec4 -template kind*(x: typedesc[int32]): ShaderUniformDataType = Int -template kind*(x: typedesc[array[2, int32]]): ShaderUniformDataType = Ivec2 -template kind*(x: typedesc[array[3, int32]]): ShaderUniformDataType = Ivec3 -template kind*(x: typedesc[array[4, int32]]): ShaderUniformDataType = Ivec4 -template kind*(x: typedesc[array[2, float32]]): ShaderUniformDataType = Vec2 -template kind*(x: typedesc[array[3, float32]]): ShaderUniformDataType = Vec3 -template kind*(x: typedesc[array[4, float32]]): ShaderUniformDataType = Vec4 + proc shaderKind(x: typedesc[Self]): ShaderUniformDataType + +template shaderKind*(x: typedesc[float32]): ShaderUniformDataType = Float +template shaderKind*(x: typedesc[Vector2]): ShaderUniformDataType = Vec2 +template shaderKind*(x: typedesc[Vector3]): ShaderUniformDataType = Vec3 +template shaderKind*(x: typedesc[Vector4]): ShaderUniformDataType = Vec4 +template shaderKind*(x: typedesc[int32]): ShaderUniformDataType = Int +template shaderKind*(x: typedesc[array[2, int32]]): ShaderUniformDataType = Ivec2 +template shaderKind*(x: typedesc[array[3, int32]]): ShaderUniformDataType = Ivec3 +template shaderKind*(x: typedesc[array[4, int32]]): ShaderUniformDataType = Ivec4 +template shaderKind*(x: typedesc[array[2, float32]]): ShaderUniformDataType = Vec2 +template shaderKind*(x: typedesc[array[3, float32]]): ShaderUniformDataType = Vec3 +template shaderKind*(x: typedesc[array[4, float32]]): ShaderUniformDataType = Vec4 proc setShaderValue*[T: ShaderV](shader: Shader, locIndex: ShaderLocation, value: T) = ## Set shader uniform value - setShaderValueImpl(shader, locIndex, addr value, kind(T)) + setShaderValueImpl(shader, locIndex, addr value, shaderKind(T)) proc setShaderValueV*[T: ShaderV](shader: Shader, locIndex: ShaderLocation, value: openArray[T]) = ## Set shader uniform value vector - setShaderValueVImpl(shader, locIndex, cast[pointer](value), kind(T), value.len.int32) + setShaderValueVImpl(shader, locIndex, cast[pointer](value), shaderKind(T), value.len.int32) proc loadModelAnimations*(fileName: string): RArray[ModelAnimation] = ## Load model animations from file @@ -170,9 +170,9 @@ proc exportImageToMemory*(image: Image, fileType: string): RArray[uint8] = type Pixel* = concept - proc kind(x: typedesc[Self]): PixelFormat + proc pixelKind(x: typedesc[Self]): PixelFormat -template kind*(x: typedesc[Color]): PixelFormat = UncompressedR8g8b8a8 +template pixelKind*(x: typedesc[Color]): PixelFormat = UncompressedR8g8b8a8 template toColorArray*(a: openArray[byte]): untyped = ## Note: that `a` should be properly formatted, with a byte representation that aligns @@ -184,10 +184,10 @@ template toColorArray*(a: openArray[byte]): untyped = proc loadTextureFromData*[T: Pixel](pixels: openArray[T], width: int32, height: int32): Texture = ## Load texture using pixels - assert getPixelDataSize(width, height, kind(T)) == pixels.len*sizeof(T), + assert getPixelDataSize(width, height, pixelKind(T)) == pixels.len*sizeof(T), "Mismatch between expected and actual data size" let image = Image(data: cast[pointer](pixels), width: width, height: height, - format: kind(T), mipmaps: 1).WeakImage + format: pixelKind(T), mipmaps: 1).WeakImage result = loadTextureFromImageImpl(image.Image) if not isTextureValid(result): raiseRaylibError("Failed to load Texture from buffer") @@ -213,27 +213,27 @@ proc loadRenderTexture*(width: int32, height: int32): RenderTexture2D = proc updateTexture*[T: Pixel](texture: Texture2D, pixels: openArray[T]) = ## Update GPU texture with new data - assert texture.format == kind(T), "Incompatible texture format" + assert texture.format == pixelKind(T), "Incompatible texture format" assert getPixelDataSize(texture.width, texture.height, texture.format) == pixels.len*sizeof(T), "Mismatch between expected and actual data size" updateTextureImpl(texture, cast[pointer](pixels)) proc updateTexture*[T: Pixel](texture: Texture2D, rec: Rectangle, pixels: openArray[T]) = ## Update GPU texture rectangle with new data - assert texture.format == kind(T), "Incompatible texture format" + assert texture.format == pixelKind(T), "Incompatible texture format" assert getPixelDataSize(rec.width.int32, rec.height.int32, texture.format) == pixels.len*sizeof(T), "Mismatch between expected and actual data size" updateTextureImpl(texture, rec, cast[pointer](pixels)) proc getPixelColor*[T: Pixel](pixel: T): Color = ## Get Color from a source pixel pointer of certain format - assert getPixelDataSize(1, 1, kind(T)) == sizeof(T), "Pixel size does not match expected format" - getPixelColorImpl(addr pixel, kind(T)) + assert getPixelDataSize(1, 1, pixelKind(T)) == sizeof(T), "Pixel size does not match expected format" + getPixelColorImpl(addr pixel, pixelKind(T)) proc setPixelColor*[T: Pixel](pixel: var T, color: Color) = ## Set color formatted into destination pixel pointer - assert getPixelDataSize(1, 1, kind(T)) == sizeof(T), "Pixel size does not match expected format" - setPixelColorImpl(addr pixel, color, kind(T)) + assert getPixelDataSize(1, 1, pixelKind(T)) == sizeof(T), "Pixel size does not match expected format" + setPixelColorImpl(addr pixel, color, pixelKind(T)) proc loadFontData*(fileData: openArray[uint8]; fontSize: int32; codepoints: openArray[int32]; `type`: FontType): RArray[GlyphInfo] = From c53ff28fa53afd044bcd78539003bed7d39b3bab Mon Sep 17 00:00:00 2001 From: Antonis Geralis Date: Thu, 21 Nov 2024 23:38:34 +0200 Subject: [PATCH 2/2] Update bindings --- src/raylib/raudio.c | 2 ++ src/raylib/raymath.h | 8 ++++++++ src/rmem.nim | 6 +++--- update_bindings.nims | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/raylib/raudio.c b/src/raylib/raudio.c index 6d16607..05b5448 100644 --- a/src/raylib/raudio.c +++ b/src/raylib/raudio.c @@ -1855,6 +1855,8 @@ void SeekMusicStream(Music music, float position) ma_mutex_lock(&AUDIO.System.lock); music.stream.buffer->framesProcessed = positionInFrames; + music.stream.buffer->isSubBufferProcessed[0] = true; + music.stream.buffer->isSubBufferProcessed[1] = true; ma_mutex_unlock(&AUDIO.System.lock); } diff --git a/src/raylib/raymath.h b/src/raylib/raymath.h index e522113..06865e1 100644 --- a/src/raylib/raymath.h +++ b/src/raylib/raymath.h @@ -304,6 +304,14 @@ RMAPI float Vector2DotProduct(Vector2 v1, Vector2 v2) return result; } +// Calculate two vectors cross product +RMAPI float Vector2CrossProduct(Vector2 v1, Vector2 v2) +{ + float result = (v1.x*v2.y - v1.y*v2.x); + + return result; +} + // Calculate distance between two vectors RMAPI float Vector2Distance(Vector2 v1, Vector2 v2) { diff --git a/src/rmem.nim b/src/rmem.nim index 2611af8..5182e46 100644 --- a/src/rmem.nim +++ b/src/rmem.nim @@ -279,9 +279,6 @@ proc realloc*(x: var MemPool, p: pointer, newSize: Natural): pointer = proc getFreeMemory*(x: MemPool): int {.inline.} = result = x.capacity - x.occupied -const - DefaultAlignment = when sizeof(int) <= 4: 8 else: 16 - type FreeNode = object next: ptr FreeNode @@ -348,6 +345,9 @@ proc free*[T](x: var ObjPool[T], p: ptr T) = node.next = x.head x.head = node +const + DefaultAlignment = when sizeof(int) <= 4: 8 else: 16 + type BiStack* = object # Double-ended stack (aka Deque) front, back: int diff --git a/update_bindings.nims b/update_bindings.nims index 0495f15..94d49a5 100644 --- a/update_bindings.nims +++ b/update_bindings.nims @@ -5,7 +5,7 @@ const PkgDir = thisDir() RaylibDir = PkgDir / "raylib" RaylibGit = "https://github.com/raysan5/raylib.git" - RayLatestCommit = "26548c10620c4ae6937cf8b506c777a006b33c16" + RayLatestCommit = "0d39e7137b28980f05843bd505ef3e74d8772d03" DocsDir = PkgDir / "docs" ToolsDir = PkgDir / "tools" ApiDir = ToolsDir / "wrapper/api"