Daniele Bartolini 10 년 전
부모
커밋
4e232edf23
3개의 변경된 파일12개의 추가작업 그리고 12개의 파일을 삭제
  1. 2 2
      src/input/input_device.cpp
  2. 2 2
      src/input/input_device.h
  3. 8 8
      src/input/input_manager.cpp

+ 2 - 2
src/input/input_device.cpp

@@ -82,7 +82,7 @@ void InputDevice::update()
 	memcpy(_last_state, _current_state, sizeof(uint8_t)*_num_buttons);
 	memcpy(_last_state, _current_state, sizeof(uint8_t)*_num_buttons);
 }
 }
 
 
-InputDevice* InputDevice::create_input_device(Allocator& a, const char* name, uint8_t num_buttons, uint8_t num_axes)
+InputDevice* InputDevice::create(Allocator& a, const char* name, uint8_t num_buttons, uint8_t num_axes)
 {
 {
 	const uint32_t size = 0
 	const uint32_t size = 0
 		+ sizeof(InputDevice)
 		+ sizeof(InputDevice)
@@ -110,7 +110,7 @@ InputDevice* InputDevice::create_input_device(Allocator& a, const char* name, ui
 	return id;
 	return id;
 }
 }
 
 
-void InputDevice::destroy_input_device(Allocator& a, InputDevice* id)
+void InputDevice::destroy(Allocator& a, InputDevice* id)
 {
 {
 	a.deallocate(id);
 	a.deallocate(id);
 }
 }

+ 2 - 2
src/input/input_device.h

@@ -66,8 +66,8 @@ public:
 
 
 public:
 public:
 
 
-	static InputDevice* create_input_device(Allocator& a, const char* name, uint8_t num_buttons, uint8_t num_axes);
-	static void destroy_input_device(Allocator& a, InputDevice* id);
+	static InputDevice* create(Allocator& a, const char* name, uint8_t num_buttons, uint8_t num_axes);
+	static void destroy(Allocator& a, InputDevice* id);
 };
 };
 
 
 } // namespace crown
 } // namespace crown

+ 8 - 8
src/input/input_manager.cpp

@@ -15,17 +15,17 @@ InputManager::InputManager()
 	, _mouse(NULL)
 	, _mouse(NULL)
 	, _touch(NULL)
 	, _touch(NULL)
 {
 {
-	_keyboard = InputDevice::create_input_device(default_allocator()
+	_keyboard = InputDevice::create(default_allocator()
 		, "Keyboard"
 		, "Keyboard"
 		, KeyboardButton::COUNT
 		, KeyboardButton::COUNT
 		, 0
 		, 0
 		);
 		);
-	_mouse = InputDevice::create_input_device(default_allocator()
+	_mouse = InputDevice::create(default_allocator()
 		, "Mouse"
 		, "Mouse"
 		, MouseButton::COUNT
 		, MouseButton::COUNT
 		, MouseAxis::COUNT
 		, MouseAxis::COUNT
 		);
 		);
-	_touch = InputDevice::create_input_device(default_allocator()
+	_touch = InputDevice::create(default_allocator()
 		, "Touch"
 		, "Touch"
 		, TouchButton::COUNT
 		, TouchButton::COUNT
 		, TouchButton::COUNT
 		, TouchButton::COUNT
@@ -33,7 +33,7 @@ InputManager::InputManager()
 
 
 	for (uint8_t i = 0; i < CROWN_MAX_JOYPADS; ++i)
 	for (uint8_t i = 0; i < CROWN_MAX_JOYPADS; ++i)
 	{
 	{
-		_joypad[i] = InputDevice::create_input_device(default_allocator()
+		_joypad[i] = InputDevice::create(default_allocator()
 			, "Joypad"
 			, "Joypad"
 			, JoypadButton::COUNT
 			, JoypadButton::COUNT
 			, JoypadAxis::COUNT
 			, JoypadAxis::COUNT
@@ -48,11 +48,11 @@ InputManager::InputManager()
 InputManager::~InputManager()
 InputManager::~InputManager()
 {
 {
 	for (uint8_t i = 0; i < CROWN_MAX_JOYPADS; ++i)
 	for (uint8_t i = 0; i < CROWN_MAX_JOYPADS; ++i)
-		InputDevice::destroy_input_device(default_allocator(), _joypad[i]);
+		InputDevice::destroy(default_allocator(), _joypad[i]);
 
 
-	InputDevice::destroy_input_device(default_allocator(), _touch);
-	InputDevice::destroy_input_device(default_allocator(), _mouse);
-	InputDevice::destroy_input_device(default_allocator(), _keyboard);
+	InputDevice::destroy(default_allocator(), _touch);
+	InputDevice::destroy(default_allocator(), _mouse);
+	InputDevice::destroy(default_allocator(), _keyboard);
 }
 }
 
 
 InputDevice* InputManager::keyboard()
 InputDevice* InputManager::keyboard()