mirror of
				https://github.com/PabloMK7/citra.git
				synced 2025-10-30 21:30:04 +00:00 
			
		
		
		
	input_common: add TouchFromButtonDevice
This commit is contained in:
		
							parent
							
								
									36809b2e2e
								
							
						
					
					
						commit
						41facaece3
					
				
					 16 changed files with 792 additions and 2 deletions
				
			
		|  | @ -7,6 +7,8 @@ add_library(input_common STATIC | |||
|     main.h | ||||
|     motion_emu.cpp | ||||
|     motion_emu.h | ||||
|     touch_from_button.cpp | ||||
|     touch_from_button.h | ||||
|     sdl/sdl.cpp | ||||
|     sdl/sdl.h | ||||
|     udp/client.cpp | ||||
|  |  | |||
|  | @ -10,6 +10,7 @@ | |||
| #include "input_common/main.h" | ||||
| #include "input_common/motion_emu.h" | ||||
| #include "input_common/sdl/sdl.h" | ||||
| #include "input_common/touch_from_button.h" | ||||
| #include "input_common/udp/udp.h" | ||||
| 
 | ||||
| namespace InputCommon { | ||||
|  | @ -26,6 +27,8 @@ void Init() { | |||
|                                                 std::make_shared<AnalogFromButton>()); | ||||
|     motion_emu = std::make_shared<MotionEmu>(); | ||||
|     Input::RegisterFactory<Input::MotionDevice>("motion_emu", motion_emu); | ||||
|     Input::RegisterFactory<Input::TouchDevice>("touch_from_button", | ||||
|                                                std::make_shared<TouchFromButtonFactory>()); | ||||
| 
 | ||||
|     sdl = SDL::Init(); | ||||
| 
 | ||||
|  | @ -38,6 +41,7 @@ void Shutdown() { | |||
|     Input::UnregisterFactory<Input::AnalogDevice>("analog_from_button"); | ||||
|     Input::UnregisterFactory<Input::MotionDevice>("motion_emu"); | ||||
|     motion_emu.reset(); | ||||
|     Input::UnregisterFactory<Input::TouchDevice>("touch_from_button"); | ||||
|     sdl.reset(); | ||||
|     udp.reset(); | ||||
| } | ||||
|  |  | |||
							
								
								
									
										49
									
								
								src/input_common/touch_from_button.cpp
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										49
									
								
								src/input_common/touch_from_button.cpp
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,49 @@ | |||
| // Copyright 2020 Citra Emulator Project
 | ||||
| // Licensed under GPLv2 or any later version
 | ||||
| // Refer to the license.txt file included.
 | ||||
| 
 | ||||
| #include "core/3ds.h" | ||||
| #include "core/settings.h" | ||||
| #include "input_common/touch_from_button.h" | ||||
| 
 | ||||
| namespace InputCommon { | ||||
| 
 | ||||
| class TouchFromButtonDevice final : public Input::TouchDevice { | ||||
| public: | ||||
|     TouchFromButtonDevice() { | ||||
|         for (const auto& config_entry : | ||||
|              Settings::values | ||||
|                  .touch_from_button_maps[Settings::values.current_input_profile | ||||
|                                              .touch_from_button_map_index] | ||||
|                  .buttons) { | ||||
| 
 | ||||
|             const Common::ParamPackage package{config_entry}; | ||||
|             map.emplace_back(Input::CreateDevice<Input::ButtonDevice>(config_entry), | ||||
|                              std::clamp(package.Get("x", 0), 0, Core::kScreenBottomWidth), | ||||
|                              std::clamp(package.Get("y", 0), 0, Core::kScreenBottomHeight)); | ||||
|         } | ||||
|     } | ||||
| 
 | ||||
|     std::tuple<float, float, bool> GetStatus() const override { | ||||
|         for (const auto& m : map) { | ||||
|             const bool state = std::get<0>(m)->GetStatus(); | ||||
|             if (state) { | ||||
|                 const float x = static_cast<float>(std::get<1>(m)) / Core::kScreenBottomWidth; | ||||
|                 const float y = static_cast<float>(std::get<2>(m)) / Core::kScreenBottomHeight; | ||||
|                 return std::make_tuple(x, y, true); | ||||
|             } | ||||
|         } | ||||
|         return std::make_tuple(0.0f, 0.0f, false); | ||||
|     } | ||||
| 
 | ||||
| private: | ||||
|     std::vector<std::tuple<std::unique_ptr<Input::ButtonDevice>, int, int>> map; // button, x, y
 | ||||
| }; | ||||
| 
 | ||||
| std::unique_ptr<Input::TouchDevice> TouchFromButtonFactory::Create( | ||||
|     const Common::ParamPackage& params) { | ||||
| 
 | ||||
|     return std::make_unique<TouchFromButtonDevice>(); | ||||
| } | ||||
| 
 | ||||
| } // namespace InputCommon
 | ||||
							
								
								
									
										24
									
								
								src/input_common/touch_from_button.h
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										24
									
								
								src/input_common/touch_from_button.h
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,24 @@ | |||
| // Copyright 2020 Citra Emulator Project
 | ||||
| // Licensed under GPLv2 or any later version
 | ||||
| // Refer to the license.txt file included.
 | ||||
| 
 | ||||
| #pragma once | ||||
| 
 | ||||
| #include <memory> | ||||
| #include "core/frontend/input.h" | ||||
| 
 | ||||
| namespace InputCommon { | ||||
| 
 | ||||
| /**
 | ||||
|  * A touch device factory that takes a list of button devices and combines them into a touch device. | ||||
|  */ | ||||
| class TouchFromButtonFactory final : public Input::Factory<Input::TouchDevice> { | ||||
| public: | ||||
|     /**
 | ||||
|      * Creates a touch device from a list of button devices | ||||
|      * @param unused | ||||
|      */ | ||||
|     std::unique_ptr<Input::TouchDevice> Create(const Common::ParamPackage& params) override; | ||||
| }; | ||||
| 
 | ||||
| } // namespace InputCommon
 | ||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue