-
Notifications
You must be signed in to change notification settings - Fork 53
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Game API v1.0.40: Add feature names to controller layouts
This change expands the existing controller layout with vectors of names for the various types of features on each controller. The API has been modified to report controller layouts using a dedicated function, which is called after the input topology is loaded. Other API calls have been simplified to just pass controller ID instead of the full layout.
- Loading branch information
Showing
10 changed files
with
329 additions
and
64 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,139 @@ | ||
| /* | ||
| * Copyright (C) 2018 Team Kodi | ||
| * http://kodi.tv | ||
| * | ||
| * This Program is free software; you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation; either version 2, or (at your option) | ||
| * any later version. | ||
| * | ||
| * This Program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this Program; see the file COPYING. If not, see | ||
| * <http://www.gnu.org/licenses/>. | ||
| * | ||
| */ | ||
|
|
||
| #include "GameClientController.h" | ||
| #include "GameClientInput.h" | ||
| #include "games/controllers/Controller.h" | ||
| #include "games/controllers/ControllerFeature.h" | ||
| #include "games/controllers/ControllerLayout.h" | ||
| #include "games/controllers/ControllerTopology.h" | ||
|
|
||
| #include <algorithm> | ||
| #include <vector> | ||
|
|
||
| using namespace KODI; | ||
| using namespace GAME; | ||
|
|
||
| CGameClientController::CGameClientController(CGameClientInput &input, ControllerPtr controller) : | ||
| m_input(input), | ||
| m_controller(std::move(controller)), | ||
| m_controllerId(m_controller->ID()) | ||
| { | ||
| // Generate arrays of features | ||
| for (const CControllerFeature &feature : m_controller->Features()) | ||
| { | ||
| // Skip feature if not supported by the game client | ||
| if (!m_input.HasFeature(m_controller->ID(), feature.Name())) | ||
| continue; | ||
|
|
||
| // Add feature to array of the appropriate type | ||
| switch (feature.Type()) | ||
| { | ||
| case FEATURE_TYPE::SCALAR: | ||
| { | ||
| switch (feature.InputType()) | ||
| { | ||
| case JOYSTICK::INPUT_TYPE::DIGITAL: | ||
| m_digitalButtons.emplace_back(const_cast<char*>(feature.Name().c_str())); | ||
| break; | ||
| case JOYSTICK::INPUT_TYPE::ANALOG: | ||
| m_analogButtons.emplace_back(const_cast<char*>(feature.Name().c_str())); | ||
| break; | ||
| default: | ||
| break; | ||
| } | ||
| break; | ||
| } | ||
| case FEATURE_TYPE::ANALOG_STICK: | ||
| m_analogSticks.emplace_back(const_cast<char*>(feature.Name().c_str())); | ||
| break; | ||
| case FEATURE_TYPE::ACCELEROMETER: | ||
| m_accelerometers.emplace_back(const_cast<char*>(feature.Name().c_str())); | ||
| break; | ||
| case FEATURE_TYPE::KEY: | ||
| m_keys.emplace_back(const_cast<char*>(feature.Name().c_str())); | ||
| break; | ||
| case FEATURE_TYPE::RELPOINTER: | ||
| m_relPointers.emplace_back(const_cast<char*>(feature.Name().c_str())); | ||
| break; | ||
| case FEATURE_TYPE::ABSPOINTER: | ||
| m_absPointers.emplace_back(const_cast<char*>(feature.Name().c_str())); | ||
| break; | ||
| case FEATURE_TYPE::MOTOR: | ||
| m_motors.emplace_back(const_cast<char*>(feature.Name().c_str())); | ||
| break; | ||
| default: | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| //! @todo Sort vectors | ||
| } | ||
|
|
||
| game_controller_layout CGameClientController::TranslateController() const | ||
| { | ||
| game_controller_layout controllerStruct{}; | ||
|
|
||
| controllerStruct.controller_id = const_cast<char*>(m_controllerId.c_str()); | ||
| controllerStruct.provides_input = m_controller->Layout().Topology().ProvidesInput(); | ||
|
|
||
| if (!m_digitalButtons.empty()) | ||
| { | ||
| controllerStruct.digital_buttons = const_cast<char**>(m_digitalButtons.data()); | ||
| controllerStruct.digital_button_count = m_digitalButtons.size(); | ||
| } | ||
| if (!m_analogButtons.empty()) | ||
| { | ||
| controllerStruct.analog_buttons = const_cast<char**>(m_analogButtons.data()); | ||
| controllerStruct.analog_button_count = m_analogButtons.size(); | ||
| } | ||
| if (!m_analogSticks.empty()) | ||
| { | ||
| controllerStruct.analog_sticks = const_cast<char**>(m_analogSticks.data()); | ||
| controllerStruct.analog_stick_count = m_analogSticks.size(); | ||
| } | ||
| if (!m_accelerometers.empty()) | ||
| { | ||
| controllerStruct.accelerometers = const_cast<char**>(m_accelerometers.data()); | ||
| controllerStruct.accelerometer_count = m_accelerometers.size(); | ||
| } | ||
| if (!m_keys.empty()) | ||
| { | ||
| controllerStruct.keys = const_cast<char**>(m_keys.data()); | ||
| controllerStruct.key_count = m_keys.size(); | ||
| } | ||
| if (!m_relPointers.empty()) | ||
| { | ||
| controllerStruct.rel_pointers = const_cast<char**>(m_relPointers.data()); | ||
| controllerStruct.rel_pointer_count = m_relPointers.size(); | ||
| } | ||
| if (!m_absPointers.empty()) | ||
| { | ||
| controllerStruct.abs_pointers = const_cast<char**>(m_absPointers.data()); | ||
| controllerStruct.abs_pointer_count = m_absPointers.size(); | ||
| } | ||
| if (!m_motors.empty()) | ||
| { | ||
| controllerStruct.motors = const_cast<char**>(m_motors.data()); | ||
| controllerStruct.motor_count = m_motors.size(); | ||
| } | ||
|
|
||
| return controllerStruct; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| /* | ||
| * Copyright (C) 2018 Team Kodi | ||
| * http://kodi.tv | ||
| * | ||
| * This Program is free software; you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation; either version 2, or (at your option) | ||
| * any later version. | ||
| * | ||
| * This Program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this Program; see the file COPYING. If not, see | ||
| * <http://www.gnu.org/licenses/>. | ||
| * | ||
| */ | ||
|
|
||
| #pragma once | ||
|
|
||
| #include "addons/kodi-addon-dev-kit/include/kodi/kodi_game_types.h" | ||
| #include "games/controllers/ControllerTypes.h" | ||
|
|
||
| #include <vector> | ||
|
|
||
| namespace KODI | ||
| { | ||
| namespace GAME | ||
| { | ||
| class CGameClientInput; | ||
|
|
||
| /*! | ||
| * \brief A container for the layout of a controller connected to a game | ||
| * client input port | ||
| */ | ||
| class CGameClientController | ||
| { | ||
| public: | ||
| /*! | ||
| * \brief Construct a controller layout | ||
| * | ||
| * \brief controller The controller add-on | ||
| */ | ||
| CGameClientController(CGameClientInput &input, ControllerPtr controller); | ||
|
|
||
| /*! | ||
| * \brief Get a controller layout for the Game API | ||
| */ | ||
| game_controller_layout TranslateController() const; | ||
|
|
||
| private: | ||
| // Construction parameters | ||
| CGameClientInput &m_input; | ||
| const ControllerPtr m_controller; | ||
|
|
||
| // Buffer parameters | ||
| std::string m_controllerId; | ||
| std::vector<char*> m_digitalButtons; | ||
| std::vector<char*> m_analogButtons; | ||
| std::vector<char*> m_analogSticks; | ||
| std::vector<char*> m_accelerometers; | ||
| std::vector<char*> m_keys; | ||
| std::vector<char*> m_relPointers; | ||
| std::vector<char*> m_absPointers; | ||
| std::vector<char*> m_motors; | ||
| }; | ||
| } // namespace GAME | ||
| } // namespace KODI |
Oops, something went wrong.