Skip to content

Commit 7c269f3

Browse files
committed
fix default axis direction mappings
1 parent 81e2431 commit 7c269f3

File tree

2 files changed

+4
-9
lines changed

2 files changed

+4
-9
lines changed

src/controller/controldevice/controller/mapping/factories/AxisDirectionMappingFactory.cpp

-9
Original file line numberDiff line numberDiff line change
@@ -130,15 +130,6 @@ AxisDirectionMappingFactory::CreateDefaultKeyboardAxisDirectionMappings(uint8_t
130130
std::vector<std::shared_ptr<ControllerAxisDirectionMapping>>
131131
AxisDirectionMappingFactory::CreateDefaultSDLAxisDirectionMappings(PhysicalDeviceType shipDeviceIndex, uint8_t portIndex,
132132
StickIndex stickIndex) {
133-
auto sdlIndexMapping = std::dynamic_pointer_cast<ShipDeviceIndexToSDLDeviceIndexMapping>(
134-
Context::GetInstance()
135-
->GetControlDeck()
136-
->GetDeviceIndexMappingManager()
137-
->GetDeviceIndexMappingFromShipDeviceIndex(shipDeviceIndex));
138-
if (sdlIndexMapping == nullptr) {
139-
return std::vector<std::shared_ptr<ControllerAxisDirectionMapping>>();
140-
}
141-
142133
std::vector<std::shared_ptr<ControllerAxisDirectionMapping>> mappings = {
143134
std::make_shared<SDLAxisDirectionToAxisDirectionMapping>(portIndex, stickIndex, LEFT,
144135
stickIndex == LEFT_STICK ? 0 : 2, -1),

src/controller/controldevice/controller/mapping/sdl/SDLAxisDirectionToAxisDirectionMapping.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ float SDLAxisDirectionToAxisDirectionMapping::GetNormalizedAxisDirectionValue()
3737
normalizedValues.push_back(fabs(axisValue * MAX_AXIS_RANGE / MAX_SDL_RANGE));
3838
}
3939

40+
if (normalizedValues.size() == 0) {
41+
return 0.0f;
42+
}
43+
4044
return *std::max_element(normalizedValues.begin(), normalizedValues.end());
4145
}
4246

0 commit comments

Comments
 (0)