fix build and basic_window example
some restructuring due to the recent changes to usingnamespace.
also cleaned up some deprecated stuff from raylib 3.7.
- appended the contents of raylib-wa.zig into raylib-zig.zig
- using raylib functions requires `const rl = @import("raylib");`
(and accesing the identifiers inside rl, like `rl.InitWindow`)
only the basic_window example was updated, and it looks like it crashes
on keyboard inputs.
many thanks to @nektro :)
This commit is contained in:
Francisco Demartino
parent
3f19a5742a
commit
5e275e93df
14 changed files with 237 additions and 166 deletions
|
|
@ -1,4 +1,51 @@
|
|||
usingnamespace @import("raylib-zig.zig");
|
||||
const rl = @import("raylib-zig.zig");
|
||||
|
||||
const AudioStream = rl.AudioStream;
|
||||
const BoneInfo = rl.BoneInfo;
|
||||
const BoundingBox = rl.BoundingBox;
|
||||
const Camera = rl.Camera;
|
||||
const Camera2D = rl.Camera2D;
|
||||
const Camera3D = rl.Camera3D;
|
||||
const CameraMode = rl.CameraMode;
|
||||
const CharInfo = rl.CharInfo;
|
||||
const Color = rl.Color;
|
||||
const Font = rl.Font;
|
||||
const Gestures = rl.Gestures;
|
||||
const Image = rl.Image;
|
||||
const KeyboardKey = rl.KeyboardKey;
|
||||
const LoadFileDataCallback = rl.LoadFileDataCallback;
|
||||
const LoadFileTextCallback = rl.LoadFileTextCallback;
|
||||
const Material = rl.Material;
|
||||
const MaterialMap = rl.MaterialMap;
|
||||
const Matrix = rl.Matrix;
|
||||
const Mesh = rl.Mesh;
|
||||
const Model = rl.Model;
|
||||
const ModelAnimation = rl.ModelAnimation;
|
||||
const MouseButton = rl.MouseButton;
|
||||
const Music = rl.Music;
|
||||
const NPatchInfo = rl.NPatchInfo;
|
||||
const Quaternion = rl.Quaternion;
|
||||
const Ray = rl.Ray;
|
||||
const RayHitInfo = rl.RayHitInfo;
|
||||
const Rectangle = rl.Rectangle;
|
||||
const RenderTexture = rl.RenderTexture;
|
||||
const RenderTexture2D = rl.RenderTexture2D;
|
||||
const SaveFileDataCallback = rl.SaveFileDataCallback;
|
||||
const SaveFileTextCallback = rl.SaveFileTextCallback;
|
||||
const Shader = rl.Shader;
|
||||
const Sound = rl.Sound;
|
||||
const Texture = rl.Texture;
|
||||
const Texture2D = rl.Texture2D;
|
||||
const TextureCubemap = rl.TextureCubemap;
|
||||
const TraceLogCallback = rl.TraceLogCallback;
|
||||
const Transform = rl.Transform;
|
||||
const Vector2 = rl.Vector2;
|
||||
const Vector3 = rl.Vector3;
|
||||
const Vector4 = rl.Vector4;
|
||||
const VrDeviceInfo = rl.VrDeviceInfo;
|
||||
const VrStereoConfig = rl.VrStereoConfig;
|
||||
const Wave = rl.Wave;
|
||||
const rAudioBuffer = rl.rAudioBuffer;
|
||||
|
||||
pub extern fn InitWindow(width: c_int, height: c_int, title: [*c]const u8) void;
|
||||
pub extern fn WindowShouldClose() bool;
|
||||
|
|
@ -23,7 +70,7 @@ pub extern fn SetWindowPosition(x: c_int, y: c_int) void;
|
|||
pub extern fn SetWindowMonitor(monitor: c_int) void;
|
||||
pub extern fn SetWindowMinSize(width: c_int, height: c_int) void;
|
||||
pub extern fn SetWindowSize(width: c_int, height: c_int) void;
|
||||
pub extern fn GetWindowHandle() *const c_void;
|
||||
pub extern fn GetWindowHandle() *const anyopaque;
|
||||
pub extern fn GetScreenWidth() c_int;
|
||||
pub extern fn GetScreenHeight() c_int;
|
||||
pub extern fn GetMonitorCount() c_int;
|
||||
|
|
@ -68,8 +115,8 @@ pub extern fn LoadShader(vsFileName: [*c]const u8, fsFileName: [*c]const u8) Sha
|
|||
pub extern fn LoadShaderFromMemory(vsCode: [*c]const u8, fsCode: [*c]const u8) Shader;
|
||||
pub extern fn GetShaderLocation(shader: Shader, uniformName: [*c]const u8) c_int;
|
||||
pub extern fn GetShaderLocationAttrib(shader: Shader, attribName: [*c]const u8) c_int;
|
||||
pub extern fn SetShaderValue(shader: Shader, locIndex: c_int, value: *const c_void, uniformType: c_int) void;
|
||||
pub extern fn SetShaderValueV(shader: Shader, locIndex: c_int, value: *const c_void, uniformType: c_int, count: c_int) void;
|
||||
pub extern fn SetShaderValue(shader: Shader, locIndex: c_int, value: *const anyopaque, uniformType: c_int) void;
|
||||
pub extern fn SetShaderValueV(shader: Shader, locIndex: c_int, value: *const anyopaque, uniformType: c_int, count: c_int) void;
|
||||
pub extern fn SetShaderValueMatrix(shader: Shader, locIndex: c_int, mat: Matrix) void;
|
||||
pub extern fn SetShaderValueTexture(shader: Shader, locIndex: c_int, texture: Texture2D) void;
|
||||
pub extern fn UnloadShader(shader: Shader) void;
|
||||
|
|
@ -89,9 +136,9 @@ pub extern fn TakeScreenshot(fileName: [*c]const u8) void;
|
|||
pub extern fn SetConfigFlags(flags: c_uint) void;
|
||||
pub extern fn TraceLog(logLevel: c_int, text: [*c]const u8, ...) void;
|
||||
pub extern fn SetTraceLogLevel(logLevel: c_int) void;
|
||||
pub extern fn MemAlloc(size: c_int) *const c_void;
|
||||
pub extern fn MemRealloc(ptr: *const c_void, size: c_int) *const c_void;
|
||||
pub extern fn MemFree(ptr: *const c_void) void;
|
||||
pub extern fn MemAlloc(size: c_int) *const anyopaque;
|
||||
pub extern fn MemRealloc(ptr: *const anyopaque, size: c_int) *const anyopaque;
|
||||
pub extern fn MemFree(ptr: *const anyopaque) void;
|
||||
pub extern fn SetTraceLogCallback(callback: TraceLogCallback) void;
|
||||
pub extern fn SetLoadFileDataCallback(callback: LoadFileDataCallback) void;
|
||||
pub extern fn SetSaveFileDataCallback(callback: SaveFileDataCallback) void;
|
||||
|
|
@ -99,7 +146,7 @@ pub extern fn SetLoadFileTextCallback(callback: LoadFileTextCallback) void;
|
|||
pub extern fn SetSaveFileTextCallback(callback: SaveFileTextCallback) void;
|
||||
pub extern fn LoadFileData(fileName: [*c]const u8, bytesRead: [*c]const c_uint) [*c]const u8;
|
||||
pub extern fn UnloadFileData(data: [*c]const u8) void;
|
||||
pub extern fn SaveFileData(fileName: [*c]const u8, data: *const c_void, bytesToWrite: c_uint) bool;
|
||||
pub extern fn SaveFileData(fileName: [*c]const u8, data: *const anyopaque, bytesToWrite: c_uint) bool;
|
||||
pub extern fn LoadFileText(fileName: [*c]const u8) [*c]const u8;
|
||||
pub extern fn UnloadFileText(text: [*c]const u8) void;
|
||||
pub extern fn SaveFileText(fileName: [*c]const u8, text: [*c]const u8) bool;
|
||||
|
|
@ -282,8 +329,8 @@ pub extern fn LoadTextureCubemap(image: Image, layout: c_int) TextureCubemap;
|
|||
pub extern fn LoadRenderTexture(width: c_int, height: c_int) RenderTexture2D;
|
||||
pub extern fn UnloadTexture(texture: Texture2D) void;
|
||||
pub extern fn UnloadRenderTexture(target: RenderTexture2D) void;
|
||||
pub extern fn UpdateTexture(texture: Texture2D, pixels: *const c_void) void;
|
||||
pub extern fn UpdateTextureRec(texture: Texture2D, rec: Rectangle, pixels: *const c_void) void;
|
||||
pub extern fn UpdateTexture(texture: Texture2D, pixels: *const anyopaque) void;
|
||||
pub extern fn UpdateTextureRec(texture: Texture2D, rec: Rectangle, pixels: *const anyopaque) void;
|
||||
pub extern fn GetTextureData(texture: Texture2D) Image;
|
||||
pub extern fn GetScreenData() Image;
|
||||
pub extern fn GenTextureMipmaps(texture: [*c]const Texture2D) void;
|
||||
|
|
@ -307,8 +354,8 @@ pub extern fn ColorFromHSV(hue: f32, saturation: f32, value: f32) Color;
|
|||
pub extern fn ColorAlpha(color: Color, alpha: f32) Color;
|
||||
pub extern fn ColorAlphaBlend(dst: Color, src: Color, tint: Color) Color;
|
||||
pub extern fn GetColor(hexValue: c_int) Color;
|
||||
pub extern fn GetPixelColor(srcPtr: *const c_void, format: c_int) Color;
|
||||
pub extern fn SetPixelColor(dstPtr: *const c_void, color: Color, format: c_int) void;
|
||||
pub extern fn GetPixelColor(srcPtr: *const anyopaque, format: c_int) Color;
|
||||
pub extern fn SetPixelColor(dstPtr: *const anyopaque, color: Color, format: c_int) void;
|
||||
pub extern fn GetPixelDataSize(width: c_int, height: c_int, format: c_int) c_int;
|
||||
pub extern fn GetFontDefault() Font;
|
||||
pub extern fn LoadFont(fileName: [*c]const u8) Font;
|
||||
|
|
@ -323,7 +370,6 @@ pub extern fn DrawFPS(posX: c_int, posY: c_int) void;
|
|||
pub extern fn DrawText(text: [*c]const u8, posX: c_int, posY: c_int, fontSize: c_int, color: Color) void;
|
||||
pub extern fn DrawTextEx(font: Font, text: [*c]const u8, position: Vector2, fontSize: f32, spacing: f32, tint: Color) void;
|
||||
pub extern fn DrawTextRec(font: Font, text: [*c]const u8, rec: Rectangle, fontSize: f32, spacing: f32, wordWrap: bool, tint: Color) void;
|
||||
pub extern fn DrawTextRecEx(font: Font, text: [*c]const u8, rec: Rectangle, fontSize: f32, spacing: f32, wordWrap: bool, tint: Color, selectStart: c_int, selectLength: c_int, selectTint: Color, selectBackTint: Color) void;
|
||||
pub extern fn DrawTextCodepoint(font: Font, codepoint: c_int, position: Vector2, fontSize: f32, tint: Color) void;
|
||||
pub extern fn MeasureText(text: [*c]const u8, fontSize: c_int) c_int;
|
||||
pub extern fn MeasureTextEx(font: Font, text: [*c]const u8, fontSize: f32, spacing: f32) Vector2;
|
||||
|
|
@ -371,7 +417,7 @@ pub extern fn LoadModelFromMesh(mesh: Mesh) Model;
|
|||
pub extern fn UnloadModel(model: Model) void;
|
||||
pub extern fn UnloadModelKeepMeshes(model: Model) void;
|
||||
pub extern fn UploadMesh(mesh: [*c]const Mesh, dynamic: bool) void;
|
||||
pub extern fn UpdateMeshBuffer(mesh: Mesh, index: c_int, data: *const c_void, dataSize: c_int, offset: c_int) void;
|
||||
pub extern fn UpdateMeshBuffer(mesh: Mesh, index: c_int, data: *const anyopaque, dataSize: c_int, offset: c_int) void;
|
||||
pub extern fn DrawMesh(mesh: Mesh, material: Material, transform: Matrix) void;
|
||||
pub extern fn DrawMeshInstanced(mesh: Mesh, material: Material, transforms: [*c]const Matrix, instances: c_int) void;
|
||||
pub extern fn UnloadMesh(mesh: Mesh) void;
|
||||
|
|
@ -424,7 +470,7 @@ pub extern fn LoadWave(fileName: [*c]const u8) Wave;
|
|||
pub extern fn LoadWaveFromMemory(fileType: [*c]const u8, fileData: [*c]const u8, dataSize: c_int) Wave;
|
||||
pub extern fn LoadSound(fileName: [*c]const u8) Sound;
|
||||
pub extern fn LoadSoundFromWave(wave: Wave) Sound;
|
||||
pub extern fn UpdateSound(sound: Sound, data: *const c_void, samplesCount: c_int) void;
|
||||
pub extern fn UpdateSound(sound: Sound, data: *const anyopaque, samplesCount: c_int) void;
|
||||
pub extern fn UnloadWave(wave: Wave) void;
|
||||
pub extern fn UnloadSound(sound: Sound) void;
|
||||
pub extern fn ExportWave(wave: Wave, fileName: [*c]const u8) bool;
|
||||
|
|
@ -458,7 +504,7 @@ pub extern fn SetMusicPitch(music: Music, pitch: f32) void;
|
|||
pub extern fn GetMusicTimeLength(music: Music) f32;
|
||||
pub extern fn GetMusicTimePlayed(music: Music) f32;
|
||||
pub extern fn InitAudioStream(sampleRate: c_uint, sampleSize: c_uint, channels: c_uint) AudioStream;
|
||||
pub extern fn UpdateAudioStream(stream: AudioStream, data: *const c_void, samplesCount: c_int) void;
|
||||
pub extern fn UpdateAudioStream(stream: AudioStream, data: *const anyopaque, samplesCount: c_int) void;
|
||||
pub extern fn CloseAudioStream(stream: AudioStream) void;
|
||||
pub extern fn IsAudioStreamProcessed(stream: AudioStream) bool;
|
||||
pub extern fn PlayAudioStream(stream: AudioStream) void;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue