Update examples.

Author: Aermoss

example.py

@@ -25,15 +25,25 @@ def main(argc: ctypes.c_int, argv: sdl3.LP_c_char_p) -> ctypes.c_int:
     audioDrivers = [sdl3.SDL_GetAudioDriver(i).decode() for i in range(sdl3.SDL_GetNumAudioDrivers())]
     print(f"Available audio drivers: {', '.join(audioDrivers)} (current: {sdl3.SDL_GetCurrentAudioDriver().decode()}).")
 
-    if currentAudioDevice := sdl3.SDL_OpenAudioDevice(sdl3.SDL_AUDIO_DEVICE_DEFAULT_PLAYBACK, None):
-        sdl3.Mix_Init(sdl3.MIX_INIT_WAVPACK)
-        sdl3.Mix_OpenAudio(currentAudioDevice, ctypes.byref(audioSpec := sdl3.SDL_AudioSpec()))
-        print(f"Current audio device: {sdl3.SDL_GetAudioDeviceName(currentAudioDevice).decode()}.")
-        chunks = [sdl3.Mix_LoadWAV(f"res/voice/{i}".encode()) for i in os.listdir("res/voice")]
-        currentIndex, channel = 0, 0
+    if not sdl3.MIX_Init():
+        print(f"Failed to initialize mixer: {sdl3.SDL_GetError().decode()}.")
+        return -1
+
+    if mixer := sdl3.MIX_CreateMixerDevice(audioDevice := sdl3.SDL_AUDIO_DEVICE_DEFAULT_PLAYBACK, None):
+        # print(f"Current audio device: {sdl3.SDL_GetAudioDeviceName(audioDevice).decode()}.")
+        track, audios, index = sdl3.MIX_CreateTrack(mixer), [], -1
+
+        for file in os.listdir("res/voice"):
+            if audio := sdl3.MIX_LoadAudio(mixer, f"res/voice/{file}".encode(), False):
+                audios.append(audio)
+
+            else:
+                print(f"Failed to load audio: {sdl3.SDL_GetError().decode()}.")
+                return -1
 
     else:
-        print(f"Failed to open audio device: {sdl3.SDL_GetAudioDeviceName(sdl3.SDL_AUDIO_DEVICE_DEFAULT_PLAYBACK).decode()}, error: {sdl3.SDL_GetError().decode()}.")
+        print(f"Failed to create mixer device: {sdl3.SDL_GetError().decode()}.")
+        return -1
 
     surface = sdl3.IMG_Load("res/example.png".encode())
     texture = sdl3.SDL_CreateTextureFromSurface(renderer, surface)
@@ -69,9 +79,10 @@ def main(argc: ctypes.c_int, argv: sdl3.LP_c_char_p) -> ctypes.c_int:
         frect.w, frect.h = frect.w * width.value / frect.w * scale, frect.h * width.value / frect.w * scale
         frect.x, frect.y = width.value / 2 - frect.w / 2, height.value / 2 - frect.h / 2
 
-        if currentAudioDevice and not sdl3.Mix_Playing(channel):
-            channel = sdl3.Mix_PlayChannel(-1, chunks[currentIndex], 1)
-            if (currentIndex := currentIndex + 1) >= len(chunks): currentIndex = 0
+        if not sdl3.MIX_TrackPlaying(track):
+            index = (index + 1) % len(audios)
+            sdl3.MIX_SetTrackAudio(track, audios[index])
+            sdl3.MIX_PlayTrack(track, 0)
 
         lastTime, deltaTime = time.time(), time.time() - lastTime
         hue, frames = (hue + 0.5 * deltaTime) % 1.0, frames + 1.0
@@ -108,12 +119,12 @@ def main(argc: ctypes.c_int, argv: sdl3.LP_c_char_p) -> ctypes.c_int:
         sdl3.SDL_DestroySurface(textSurface)
         sdl3.SDL_DestroyTexture(textTexture)
 
-    if currentAudioDevice:
-        for i in chunks:
-            sdl3.Mix_FreeChunk(i)
+    for audio in audios:
+        sdl3.MIX_DestroyAudio(audio)
 
-        sdl3.Mix_CloseAudio()
-        sdl3.Mix_Quit()
+    sdl3.MIX_DestroyTrack(track)
+    sdl3.MIX_DestroyMixer(mixer)
+    sdl3.MIX_Quit()
 
     sdl3.TTF_CloseFont(font)
     sdl3.TTF_Quit()

gpu.py

@@ -66,9 +66,9 @@ def main(argc: ctypes.c_int, argv: sdl3.LP_c_char_p) -> ctypes.c_int:
     transferBuffer = sdl3.SDL_CreateGPUTransferBuffer(device, sdl3.SDL_GPUTransferBufferCreateInfo(sdl3.SDL_GPU_TRANSFERBUFFERUSAGE_UPLOAD, ctypes.sizeof(Vertex) * 3))
 
     transferData = ctypes.cast(sdl3.SDL_MapGPUTransferBuffer(device, transferBuffer, False), sdl3.SDL_POINTER[Vertex])
-    transferData[0] = Vertex(sdl3.SDL_ARRAY(-0.5, -0.5, 0.0, type = ctypes.c_float)[0])
-    transferData[1] = Vertex(sdl3.SDL_ARRAY( 0.5, -0.5, 0.0, type = ctypes.c_float)[0])
-    transferData[2] = Vertex(sdl3.SDL_ARRAY( 0.0,  0.5, 0.0, type = ctypes.c_float)[0])
+    transferData[0] = Vertex(sdl3.SDL_ARRAY(-0.5, -0.5, 0.0, _type = ctypes.c_float)[0])
+    transferData[1] = Vertex(sdl3.SDL_ARRAY( 0.5, -0.5, 0.0, _type = ctypes.c_float)[0])
+    transferData[2] = Vertex(sdl3.SDL_ARRAY( 0.0,  0.5, 0.0, _type = ctypes.c_float)[0])
     sdl3.SDL_UnmapGPUTransferBuffer(device, transferBuffer)
 
     commandBuffer = sdl3.SDL_AcquireGPUCommandBuffer(device)
@@ -110,9 +110,9 @@ def main(argc: ctypes.c_int, argv: sdl3.LP_c_char_p) -> ctypes.c_int:
         colorTargetInfo = sdl3.SDL_GPUColorTargetInfo(swapChainTexture, load_op = sdl3.SDL_GPU_LOADOP_CLEAR,
             clear_color = sdl3.SDL_FColor(*colorsys.hsv_to_rgb(hue := (hue + 0.25 * deltaTime) % 1, 1.0, 0.0), 1.0))
 
-        uniformData.color0 = sdl3.SDL_ARRAY(*colorsys.hsv_to_rgb(hue + 0.48, 1.0, 1.0), 1.0, type = ctypes.c_float)[0]
-        uniformData.color1 = sdl3.SDL_ARRAY(*colorsys.hsv_to_rgb(hue + 0.32, 1.0, 1.0), 1.0, type = ctypes.c_float)[0]
-        uniformData.color2 = sdl3.SDL_ARRAY(*colorsys.hsv_to_rgb(hue + 0.64, 1.0, 1.0), 1.0, type = ctypes.c_float)[0]
+        uniformData.color0 = sdl3.SDL_ARRAY(*colorsys.hsv_to_rgb(hue + 0.48, 1.0, 1.0), 1.0, _type = ctypes.c_float)[0]
+        uniformData.color1 = sdl3.SDL_ARRAY(*colorsys.hsv_to_rgb(hue + 0.32, 1.0, 1.0), 1.0, _type = ctypes.c_float)[0]
+        uniformData.color2 = sdl3.SDL_ARRAY(*colorsys.hsv_to_rgb(hue + 0.64, 1.0, 1.0), 1.0, _type = ctypes.c_float)[0]
 
         renderPass = sdl3.SDL_BeginGPURenderPass(commandBuffer, ctypes.byref(colorTargetInfo), 1, None)
         sdl3.SDL_BindGPUGraphicsPipeline(renderPass, pipeline)

shader.py

@@ -113,7 +113,7 @@
     0x38, 0x00, 0x00, 0x00, 0x35, 0x00, 0x00, 0x00, 0x36, 0x00, 0x00, 0x00, 0x37, 0x00, 0x00, 0x00,
     0x34, 0x00, 0x00, 0x00, 0x41, 0x00, 0x05, 0x00, 0x08, 0x00, 0x00, 0x00, 0x39, 0x00, 0x00, 0x00,
     0x2f, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x03, 0x00, 0x39, 0x00, 0x00, 0x00,
-    0x38, 0x00, 0x00, 0x00, 0xfd, 0x00, 0x01, 0x00, 0x38, 0x00, 0x01, 0x00, type = ctypes.c_uint8
+    0x38, 0x00, 0x00, 0x00, 0xfd, 0x00, 0x01, 0x00, 0x38, 0x00, 0x01, 0x00, _type = ctypes.c_uint8
 )[::-1]
 
 fragmentData = sdl3.SDL_ARRAY(
@@ -145,5 +145,5 @@
     0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0xf8, 0x00, 0x02, 0x00, 0x05, 0x00, 0x00, 0x00,
     0x3d, 0x00, 0x04, 0x00, 0x07, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00,
     0x3e, 0x00, 0x03, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0xfd, 0x00, 0x01, 0x00,
-    0x38, 0x00, 0x01, 0x00, type = ctypes.c_uint8
+    0x38, 0x00, 0x01, 0x00, _type = ctypes.c_uint8
 )[::-1]