Bläddra i källkod

src: add missing const

Daniele Bartolini 3 år sedan
förälder
incheckning
45d53d27fc
3 ändrade filer med 25 tillägg och 25 borttagningar
  1. 5 5
      src/device/input_device.cpp
  2. 5 5
      src/device/input_device.h
  3. 15 15
      src/lua/lua_api.cpp

+ 5 - 5
src/device/input_device.cpp

@@ -106,7 +106,7 @@ Vector3 InputDevice::axis(u8 id) const
 	return axis;
 }
 
-const char *InputDevice::button_name(u8 id)
+const char *InputDevice::button_name(u8 id) const
 {
 	return id < _num_buttons
 		? _button_name[id]
@@ -114,7 +114,7 @@ const char *InputDevice::button_name(u8 id)
 		;
 }
 
-const char *InputDevice::axis_name(u8 id)
+const char *InputDevice::axis_name(u8 id) const
 {
 	return id < _num_axes
 		? _axis_name[id]
@@ -122,7 +122,7 @@ const char *InputDevice::axis_name(u8 id)
 		;
 }
 
-u8 InputDevice::button_id(StringId32 name)
+u8 InputDevice::button_id(StringId32 name) const
 {
 	for (u32 i = 0; i < _num_buttons; ++i) {
 		if (_button_hash[i] == name)
@@ -132,7 +132,7 @@ u8 InputDevice::button_id(StringId32 name)
 	return UINT8_MAX;
 }
 
-u8 InputDevice::axis_id(StringId32 name)
+u8 InputDevice::axis_id(StringId32 name) const
 {
 	for (u32 i = 0; i < _num_axes; ++i) {
 		if (_axis_hash[i] == name)
@@ -142,7 +142,7 @@ u8 InputDevice::axis_id(StringId32 name)
 	return UINT8_MAX;
 }
 
-f32 InputDevice::deadzone(u8 id, DeadzoneMode::Enum *deadzone_mode)
+f32 InputDevice::deadzone(u8 id, DeadzoneMode::Enum *deadzone_mode) const
 {
 	if (id < _num_axes) {
 		*deadzone_mode = (DeadzoneMode::Enum)_deadzone_mode[id];

+ 5 - 5
src/device/input_device.h

@@ -71,19 +71,19 @@ struct InputDevice
 	Vector3 axis(u8 id) const;
 
 	/// Returns the name of the button @a id or NULL if no matching button is found.
-	const char *button_name(u8 id);
+	const char *button_name(u8 id) const;
 
 	/// Returns the name of the axis @a id of NULL if no matching axis is found.
-	const char *axis_name(u8 id);
+	const char *axis_name(u8 id) const;
 
 	/// Returns the id of the button @a name or UINT8_MAX if no matching button is found.
-	u8 button_id(StringId32 name);
+	u8 button_id(StringId32 name) const;
 
 	/// Returns the id of the axis @a name of UINT8_MAX if no matching axis is found.
-	u8 axis_id(StringId32 name);
+	u8 axis_id(StringId32 name) const;
 
 	/// Returns the deadzone size and the deadzone @a mode for the axis @a id.
-	f32 deadzone(u8 id, DeadzoneMode::Enum *deadzone_mode);
+	f32 deadzone(u8 id, DeadzoneMode::Enum *deadzone_mode) const;
 
 	/// Sets the @a deadzone_mode and @a deadzone_size for the axis @a id.
 	void set_deadzone(u8 id, DeadzoneMode::Enum deadzone_mode, f32 deadzone_size);

+ 15 - 15
src/lua/lua_api.cpp

@@ -215,49 +215,49 @@ static int quaternionbox_unbox(lua_State *L)
 	return 1;
 }
 
-static int input_device_name(lua_State *L, InputDevice &dev)
+static int input_device_name(lua_State *L, const InputDevice &dev)
 {
 	LuaStack stack(L);
 	stack.push_string(dev.name());
 	return 1;
 }
 
-static int input_device_connected(lua_State *L, InputDevice &dev)
+static int input_device_connected(lua_State *L, const InputDevice &dev)
 {
 	LuaStack stack(L);
 	stack.push_bool(dev.connected());
 	return 1;
 }
 
-static int input_device_num_buttons(lua_State *L, InputDevice &dev)
+static int input_device_num_buttons(lua_State *L, const InputDevice &dev)
 {
 	LuaStack stack(L);
 	stack.push_int(dev.num_buttons());
 	return 1;
 }
 
-static int input_device_num_axes(lua_State *L, InputDevice &dev)
+static int input_device_num_axes(lua_State *L, const InputDevice &dev)
 {
 	LuaStack stack(L);
 	stack.push_int(dev.num_axes());
 	return 1;
 }
 
-static int input_device_pressed(lua_State *L, InputDevice &dev)
+static int input_device_pressed(lua_State *L, const InputDevice &dev)
 {
 	LuaStack stack(L);
 	stack.push_bool(dev.pressed(stack.get_int(1)));
 	return 1;
 }
 
-static int input_device_released(lua_State *L, InputDevice &dev)
+static int input_device_released(lua_State *L, const InputDevice &dev)
 {
 	LuaStack stack(L);
 	stack.push_bool(dev.released(stack.get_int(1)));
 	return 1;
 }
 
-static int input_device_any_pressed(lua_State *L, InputDevice &dev)
+static int input_device_any_pressed(lua_State *L, const InputDevice &dev)
 {
 	LuaStack stack(L);
 	const u8 button = dev.any_pressed();
@@ -268,7 +268,7 @@ static int input_device_any_pressed(lua_State *L, InputDevice &dev)
 	return 1;
 }
 
-static int input_device_any_released(lua_State *L, InputDevice &dev)
+static int input_device_any_released(lua_State *L, const InputDevice &dev)
 {
 	LuaStack stack(L);
 	const u8 button = dev.any_released();
@@ -279,21 +279,21 @@ static int input_device_any_released(lua_State *L, InputDevice &dev)
 	return 1;
 }
 
-static int input_device_button(lua_State *L, InputDevice &dev)
+static int input_device_button(lua_State *L, const InputDevice &dev)
 {
 	LuaStack stack(L);
 	stack.push_float(dev.button(stack.get_int(1)));
 	return 1;
 }
 
-static int input_device_axis(lua_State *L, InputDevice &dev)
+static int input_device_axis(lua_State *L, const InputDevice &dev)
 {
 	LuaStack stack(L);
 	stack.push_vector3(dev.axis(stack.get_int(1)));
 	return 1;
 }
 
-static int input_device_button_name(lua_State *L, InputDevice &dev)
+static int input_device_button_name(lua_State *L, const InputDevice &dev)
 {
 	LuaStack stack(L);
 	const char *name = dev.button_name(stack.get_int(1));
@@ -306,7 +306,7 @@ static int input_device_button_name(lua_State *L, InputDevice &dev)
 	return 1;
 }
 
-static int input_device_axis_name(lua_State *L, InputDevice &dev)
+static int input_device_axis_name(lua_State *L, const InputDevice &dev)
 {
 	LuaStack stack(L);
 	const char *name = dev.axis_name(stack.get_int(1));
@@ -319,7 +319,7 @@ static int input_device_axis_name(lua_State *L, InputDevice &dev)
 	return 1;
 }
 
-static int input_device_button_id(lua_State *L, InputDevice &dev)
+static int input_device_button_id(lua_State *L, const InputDevice &dev)
 {
 	LuaStack stack(L);
 	const u8 id = dev.button_id(stack.get_string_id_32(1));
@@ -332,7 +332,7 @@ static int input_device_button_id(lua_State *L, InputDevice &dev)
 	return 1;
 }
 
-static int input_device_axis_id(lua_State *L, InputDevice &dev)
+static int input_device_axis_id(lua_State *L, const InputDevice &dev)
 {
 	LuaStack stack(L);
 	const u8 id = dev.axis_id(stack.get_string_id_32(1));
@@ -345,7 +345,7 @@ static int input_device_axis_id(lua_State *L, InputDevice &dev)
 	return 1;
 }
 
-static int input_device_deadzone(lua_State *L, InputDevice &dev)
+static int input_device_deadzone(lua_State *L, const InputDevice &dev)
 {
 	LuaStack stack(L);
 	int axis_id = stack.get_int(1);