zig/mach
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

glfw: ziggify gamepad action enumerations

Browse source 
Helps hexops/mach#37

Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
This commit is contained in:
Stephen Gutekanst 2021-10-30 11:13:53 -07:00 • committed by Stephen Gutekanst
parent 8a14d56fc3
commit 2154ee5aea
4 changed files with 23 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

9
glfw/src/Joystick.zig
View file

@ -9,6 +9,7 @@ const c = @import("c.zig").c;
const Window = @import("Window.zig"); const Window = @import("Window.zig");
const Error = @import("errors.zig").Error; const Error = @import("errors.zig").Error;
const getError = @import("errors.zig").getError; const getError = @import("errors.zig").getError;
const GamepadAxis = @import("gamepad_axis.zig").GamepadAxis;
const Joystick = @This(); const Joystick = @This();
@ -46,7 +47,14 @@ const GamepadState = extern struct {
buttons: [15]u8, buttons: [15]u8,
/// The states of each gamepad axis (see gamepad_axes), in the range -1.0 to 1.0 inclusive. /// The states of each gamepad axis (see gamepad_axes), in the range -1.0 to 1.0 inclusive.
///
/// Use the enumeration helper e.g. `.getAxis(.left_x)` to access these indices.
axes: [6]f32, axes: [6]f32,
/// Returns the status of the specified gamepad axis, in the range -1.0 to 1.0 inclusive.
pub fn getAxis(self: @This(), which: GamepadAxis) f32 {
return self.axis[which];
}
}; };
/// Returns whether the specified joystick is present. /// Returns whether the specified joystick is present.
@ -540,4 +548,5 @@ test "getGamepadState" {
const joystick = glfw.Joystick{ .jid = glfw.Joystick.one }; const joystick = glfw.Joystick{ .jid = glfw.Joystick.one };
_ = joystick.getGamepadState() catch |err| std.debug.print("failed to get gamepad state, joysticks not supported? error={}\n", .{err}); _ = joystick.getGamepadState() catch |err| std.debug.print("failed to get gamepad state, joysticks not supported? error={}\n", .{err});
_ = (GamepadState{}).getAxis(.left_x);
} }

4
glfw/src/action.zig
View file

@ -1,8 +1,6 @@
//! Key and button actions
const c = @import("c.zig").c; const c = @import("c.zig").c;
/// Holds all GLFW C action enumerations in their raw form. /// Key and button actions
pub const Action = enum(c_int) { pub const Action = enum(c_int) {
/// The key or mouse button was released. /// The key or mouse button was released.
release = c.GLFW_RELEASE, release = c.GLFW_RELEASE,

23
glfw/src/gamepad_axis.zig
View file

@ -1,13 +1,14 @@
//! Gamepad axes.
//!
//! See glfw.getGamepadState for how these are used.
const c = @import("c.zig").c; const c = @import("c.zig").c;
pub const left_x = c.GLFW_GAMEPAD_AXIS_LEFT_X; /// Gamepad axes.
pub const left_y = c.GLFW_GAMEPAD_AXIS_LEFT_Y; ///
pub const right_x = c.GLFW_GAMEPAD_AXIS_RIGHT_X; /// See glfw.getGamepadState for how these are used.
pub const right_y = c.GLFW_GAMEPAD_AXIS_RIGHT_Y; pub const GamepadAxis = enum(c_int) {
pub const left_trigger = c.GLFW_GAMEPAD_AXIS_LEFT_TRIGGER; left_x = c.GLFW_GAMEPAD_AXIS_LEFT_X,
pub const right_trigger = c.GLFW_GAMEPAD_AXIS_RIGHT_TRIGGER; left_y = c.GLFW_GAMEPAD_AXIS_LEFT_Y,
pub const left = right_trigger; right_x = c.GLFW_GAMEPAD_AXIS_RIGHT_X,
right_y = c.GLFW_GAMEPAD_AXIS_RIGHT_Y,
left_trigger = c.GLFW_GAMEPAD_AXIS_LEFT_TRIGGER,
right_trigger = c.GLFW_GAMEPAD_AXIS_RIGHT_TRIGGER,
last = .right_trigger,
};

2
glfw/src/main.zig
View file

@ -10,7 +10,7 @@ pub const Error = @import("errors.zig").Error;
const getError = @import("errors.zig").getError; const getError = @import("errors.zig").getError;
pub const Action = @import("action.zig").Action; pub const Action = @import("action.zig").Action;
pub const gamepad_axis = @import("gamepad_axis.zig"); pub const GamepadAxis = @import("gamepad_axis.zig").GamepadAxis;
pub const gamepad_button = @import("gamepad_button.zig"); pub const gamepad_button = @import("gamepad_button.zig");
pub const GammaRamp = @import("GammaRamp.zig"); pub const GammaRamp = @import("GammaRamp.zig");
pub const hat = @import("hat.zig"); pub const hat = @import("hat.zig");