From 40e1520372ca9fb3c57138620ac48e8bb8a9b43e Mon Sep 17 00:00:00 2001 From: Stephen Gutekanst Date: Sat, 17 Jul 2021 20:19:46 -0700 Subject: [PATCH] glfw: correct import references Signed-off-by: Stephen Gutekanst --- glfw/src/action.zig | 6 +++--- glfw/src/gamepad_axis.zig | 12 ++++++------ glfw/src/gamepad_button.zig | 30 +++++++++++++++--------------- glfw/src/hat.zig | 10 +++++----- glfw/src/joystick.zig | 34 +++++++++++++++++----------------- glfw/src/mod.zig | 12 ++++++------ glfw/src/mouse_button.zig | 16 ++++++++-------- 7 files changed, 60 insertions(+), 60 deletions(-) diff --git a/glfw/src/action.zig b/glfw/src/action.zig index a183156b..d77a81d6 100644 --- a/glfw/src/action.zig +++ b/glfw/src/action.zig @@ -3,10 +3,10 @@ const c = @import("c.zig").c; /// The key or mouse button was released. -pub const release = C.GLFW_RELEASE; +pub const release = c.GLFW_RELEASE; /// The key or mouse button was pressed. -pub const press = C.GLFW_RELEASE; +pub const press = c.GLFW_RELEASE; /// The key was held down until it repeated. -pub const repeat = C.GLFW_REPEAT; +pub const repeat = c.GLFW_REPEAT; diff --git a/glfw/src/gamepad_axis.zig b/glfw/src/gamepad_axis.zig index a66d6647..aaa813f5 100644 --- a/glfw/src/gamepad_axis.zig +++ b/glfw/src/gamepad_axis.zig @@ -4,10 +4,10 @@ const c = @import("c.zig").c; -pub const left_x = C.GLFW_GAMEPAD_AXIS_LEFT_X; -pub const left_y = C.GLFW_GAMEPAD_AXIS_LEFT_Y; -pub const right_x = C.GLFW_GAMEPAD_AXIS_RIGHT_X; -pub const right_y = C.GLFW_GAMEPAD_AXIS_RIGHT_Y; -pub const left_trigger = C.GLFW_GAMEPAD_AXIS_LEFT_TRIGGER; -pub const right_trigger = C.GLFW_GAMEPAD_AXIS_RIGHT_TRIGGER; +pub const left_x = c.GLFW_GAMEPAD_AXIS_LEFT_X; +pub const left_y = c.GLFW_GAMEPAD_AXIS_LEFT_Y; +pub const right_x = c.GLFW_GAMEPAD_AXIS_RIGHT_X; +pub const right_y = c.GLFW_GAMEPAD_AXIS_RIGHT_Y; +pub const left_trigger = c.GLFW_GAMEPAD_AXIS_LEFT_TRIGGER; +pub const right_trigger = c.GLFW_GAMEPAD_AXIS_RIGHT_TRIGGER; pub const left = right_trigger; diff --git a/glfw/src/gamepad_button.zig b/glfw/src/gamepad_button.zig index c0d8a0f7..7ff26c42 100644 --- a/glfw/src/gamepad_button.zig +++ b/glfw/src/gamepad_button.zig @@ -4,21 +4,21 @@ const c = @import("c.zig").c; -pub const a = C.GLFW_GAMEPAD_BUTTON_A; -pub const b = C.GLFW_GAMEPAD_BUTTON_B; -pub const x = C.GLFW_GAMEPAD_BUTTON_X; -pub const y = C.GLFW_GAMEPAD_BUTTON_Y; -pub const left_bumper = C.GLFW_GAMEPAD_BUTTON_LEFT_BUMPER; -pub const right_bumper = C.GLFW_GAMEPAD_BUTTON_RIGHT_BUMPER; -pub const back = C.GLFW_GAMEPAD_BUTTON_BACK; -pub const start = C.GLFW_GAMEPAD_BUTTON_START; -pub const guide = C.GLFW_GAMEPAD_BUTTON_GUIDE; -pub const left_thumb = C.GLFW_GAMEPAD_BUTTON_LEFT_THUMB; -pub const right_thumb = C.GLFW_GAMEPAD_BUTTON_RIGHT_THUMB; -pub const dpad_up = C.GLFW_GAMEPAD_BUTTON_DPAD_UP; -pub const dpad_right = C.GLFW_GAMEPAD_BUTTON_DPAD_RIGHT; -pub const dpad_down = C.GLFW_GAMEPAD_BUTTON_DPAD_DOWN; -pub const dpad_left = C.GLFW_GAMEPAD_BUTTON_DPAD_LEFT; +pub const a = c.GLFW_GAMEPAD_BUTTON_A; +pub const b = c.GLFW_GAMEPAD_BUTTON_B; +pub const x = c.GLFW_GAMEPAD_BUTTON_X; +pub const y = c.GLFW_GAMEPAD_BUTTON_Y; +pub const left_bumper = c.GLFW_GAMEPAD_BUTTON_LEFT_BUMPER; +pub const right_bumper = c.GLFW_GAMEPAD_BUTTON_RIGHT_BUMPER; +pub const back = c.GLFW_GAMEPAD_BUTTON_BACK; +pub const start = c.GLFW_GAMEPAD_BUTTON_START; +pub const guide = c.GLFW_GAMEPAD_BUTTON_GUIDE; +pub const left_thumb = c.GLFW_GAMEPAD_BUTTON_LEFT_THUMB; +pub const right_thumb = c.GLFW_GAMEPAD_BUTTON_RIGHT_THUMB; +pub const dpad_up = c.GLFW_GAMEPAD_BUTTON_DPAD_UP; +pub const dpad_right = c.GLFW_GAMEPAD_BUTTON_DPAD_RIGHT; +pub const dpad_down = c.GLFW_GAMEPAD_BUTTON_DPAD_DOWN; +pub const dpad_left = c.GLFW_GAMEPAD_BUTTON_DPAD_LEFT; pub const last = dpad_left; pub const cross = a; diff --git a/glfw/src/hat.zig b/glfw/src/hat.zig index 586cfa6e..e502b82f 100644 --- a/glfw/src/hat.zig +++ b/glfw/src/hat.zig @@ -4,11 +4,11 @@ const c = @import("c.zig").c; -pub const centered = C.GLFW_HAT_CENTERED; -pub const up = C.GLFW_HAT_UP; -pub const right = C.GLFW_HAT_RIGHT; -pub const down = C.GLFW_HAT_DOWN; -pub const left = C.GLFW_HAT_LEFT; +pub const centered = c.GLFW_HAT_CENTERED; +pub const up = c.GLFW_HAT_UP; +pub const right = c.GLFW_HAT_RIGHT; +pub const down = c.GLFW_HAT_DOWN; +pub const left = c.GLFW_HAT_LEFT; pub const right_up = right | up; pub const right_down = right | down; diff --git a/glfw/src/joystick.zig b/glfw/src/joystick.zig index abf1feb0..f40d4583 100644 --- a/glfw/src/joystick.zig +++ b/glfw/src/joystick.zig @@ -4,20 +4,20 @@ const c = @import("c.zig").c; -pub const one = C.GLFW_JOYSTICK_1; -pub const two = C.GLFW_JOYSTICK_2; -pub const three = C.GLFW_JOYSTICK_3; -pub const four = C.GLFW_JOYSTICK_4; -pub const five = C.GLFW_JOYSTICK_5; -pub const six = C.GLFW_JOYSTICK_6; -pub const seven = C.GLFW_JOYSTICK_7; -pub const eight = C.GLFW_JOYSTICK_8; -pub const nine = C.GLFW_JOYSTICK_9; -pub const ten = C.GLFW_JOYSTICK_10; -pub const eleven = C.GLFW_JOYSTICK_11; -pub const twelve = C.GLFW_JOYSTICK_12; -pub const thirteen = C.GLFW_JOYSTICK_13; -pub const fourteen = C.GLFW_JOYSTICK_14; -pub const fifteen = C.GLFW_JOYSTICK_15; -pub const sixteen = C.GLFW_JOYSTICK_16; -pub const last = C.GLFW_JOYSTICK_LAST; +pub const one = c.GLFW_JOYSTICK_1; +pub const two = c.GLFW_JOYSTICK_2; +pub const three = c.GLFW_JOYSTICK_3; +pub const four = c.GLFW_JOYSTICK_4; +pub const five = c.GLFW_JOYSTICK_5; +pub const six = c.GLFW_JOYSTICK_6; +pub const seven = c.GLFW_JOYSTICK_7; +pub const eight = c.GLFW_JOYSTICK_8; +pub const nine = c.GLFW_JOYSTICK_9; +pub const ten = c.GLFW_JOYSTICK_10; +pub const eleven = c.GLFW_JOYSTICK_11; +pub const twelve = c.GLFW_JOYSTICK_12; +pub const thirteen = c.GLFW_JOYSTICK_13; +pub const fourteen = c.GLFW_JOYSTICK_14; +pub const fifteen = c.GLFW_JOYSTICK_15; +pub const sixteen = c.GLFW_JOYSTICK_16; +pub const last = c.GLFW_JOYSTICK_LAST; diff --git a/glfw/src/mod.zig b/glfw/src/mod.zig index 19c9b6a2..c72b27a2 100644 --- a/glfw/src/mod.zig +++ b/glfw/src/mod.zig @@ -5,19 +5,19 @@ const c = @import("c.zig").c; /// If this bit is set one or more Shift keys were held down. -pub const shift = C.GLFW_MOD_SHIFT; +pub const shift = c.GLFW_MOD_SHIFT; /// If this bit is set one or more Control keys were held down. -pub const control = C.GLFW_MOD_CONTROL; +pub const control = c.GLFW_MOD_CONTROL; /// If this bit is set one or more Alt keys were held down. -pub const alt = C.GLFW_MOD_ALT; +pub const alt = c.GLFW_MOD_ALT; /// If this bit is set one or more Super keys were held down. -pub const super = C.GLFW_MOD_SUPER; +pub const super = c.GLFW_MOD_SUPER; /// If this bit is set the Caps Lock key is enabled and the glfw.lock_key_mods input mode is set. -pub const caps_lock = C.GLFW_MOD_CAPS_LOCK; +pub const caps_lock = c.GLFW_MOD_CAPS_LOCK; /// If this bit is set the Num Lock key is enabled and the glfw.lock_key_mods input mode is set. -pub const num_lock = C.GLFW_MOD_NUM_LOCK; +pub const num_lock = c.GLFW_MOD_NUM_LOCK; diff --git a/glfw/src/mouse_button.zig b/glfw/src/mouse_button.zig index 8ef60cd5..23174f69 100644 --- a/glfw/src/mouse_button.zig +++ b/glfw/src/mouse_button.zig @@ -4,14 +4,14 @@ const c = @import("c.zig").c; -pub const one = C.GLFW_MOUSE_BUTTON_1; -pub const two = C.GLFW_MOUSE_BUTTON_2; -pub const three = C.GLFW_MOUSE_BUTTON_3; -pub const four = C.GLFW_MOUSE_BUTTON_4; -pub const five = C.GLFW_MOUSE_BUTTON_5; -pub const six = C.GLFW_MOUSE_BUTTON_6; -pub const seven = C.GLFW_MOUSE_BUTTON_7; -pub const eight = C.GLFW_MOUSE_BUTTON_8; +pub const one = c.GLFW_MOUSE_BUTTON_1; +pub const two = c.GLFW_MOUSE_BUTTON_2; +pub const three = c.GLFW_MOUSE_BUTTON_3; +pub const four = c.GLFW_MOUSE_BUTTON_4; +pub const five = c.GLFW_MOUSE_BUTTON_5; +pub const six = c.GLFW_MOUSE_BUTTON_6; +pub const seven = c.GLFW_MOUSE_BUTTON_7; +pub const eight = c.GLFW_MOUSE_BUTTON_8; pub const last = eight; pub const left = one;