@@ -138,10 +138,10 @@ namespace RTE {
138
138
#define c_PlayerSlotColorHovered makecol (203 , 130 , 56 )
139
139
#define c_PlayerSlotColorDisabled makecol (104 , 67 , 15 )
140
140
static constexpr std::array<float, 16> c_Quad{
141
- 1 .0f , 1 .0f , 1 .0f , 0 .0f ,
142
- 1 .0f , -1 .0f , 1 .0f , 1 .0f ,
143
- -1 .0f , 1 .0f , 0 .0f , 0 .0f ,
144
- -1 .0f , -1 .0f , 0 .0f , 1 .0f };
141
+ 1 .0f , 1 .0f , 1 .0f , 0 .0f ,
142
+ 1 .0f , -1 .0f , 1 .0f , 1 .0f ,
143
+ -1 .0f , 1 .0f , 0 .0f , 0 .0f ,
144
+ -1 .0f , -1 .0f , 0 .0f , 1 .0f };
145
145
146
146
static constexpr float c_GuiDepth = -100 .0f ;
147
147
static constexpr float c_DefaultDrawDepth = 0 .0f ;
@@ -220,7 +220,6 @@ namespace RTE {
220
220
INPUT_JUMP,
221
221
INPUT_CROUCH,
222
222
INPUT_PRONE,
223
- INPUT_SHIFT,
224
223
INPUT_NEXT,
225
224
INPUT_PREV,
226
225
INPUT_WEAPON_CHANGE_NEXT,
@@ -242,41 +241,40 @@ namespace RTE {
242
241
};
243
242
244
243
static const std::array<const std::string_view, InputElements::INPUT_COUNT> c_InputElementNames = {
245
- " Move Up" , // INPUT_L_UP
246
- " Move Down" , // INPUT_L_DOWN
247
- " Move Left" , // INPUT_L_LEFT
248
- " Move Right" , // INPUT_L_RIGHT
249
- " Run" , // INPUT_MOVE_FAST
250
- " Run (Toggle)" , // INPUT_MOVE_FAST_TOGGLE
251
- " Aim Up" , // INPUT_AIM_UP
252
- " Aim Down" , // INPUT_AIM_DOWN
253
- " Aim Left" , // INPUT_AIM_LEFT
254
- " Aim Right" , // INPUT_AIM_RIGHT
255
- " Fire/Activate" , // INPUT_FIRE
256
- " Sharp Aim" , // INPUT_AIM
257
- " Pie Menu (Analog)" , // INPUT_PIEMENU_ANALOG
258
- " Pie Menu (Digital)" , // INPUT_PIEMENU_DIGITAL
259
- " Jump" , // INPUT_JUMP
260
- " Crouch" , // INPUT_CROUCH
261
- " Prone" , // INPUT_PRONE
262
- " Shift" , // INPUT_SHIFT
263
- " Next Body" , // INPUT_NEXT
264
- " Prev. Body" , // INPUT_PREV
265
- " Next Device" , // INPUT_WEAPON_CHANGE_NEXT
266
- " Prev. Device" , // INPUT_WEAPON_CHANGE_PREV
267
- " Pick Up Device" , // INPUT_WEAPON_PICKUP
268
- " Drop Device" , // INPUT_WEAPON_DROP
269
- " Reload Weapon" , // INPUT_WEAPON_RELOAD
270
- " Primary Weapon Hotkey" , // INPUT_WEAPON_PRIMARY_HOTKEY
271
- " Auxiliary Weapon Hotkey" , // INPUT_WEAPON_AUXILIARY_HOTKEY
244
+ " Move Up" , // INPUT_L_UP
245
+ " Move Down" , // INPUT_L_DOWN
246
+ " Move Left" , // INPUT_L_LEFT
247
+ " Move Right" , // INPUT_L_RIGHT
248
+ " Run" , // INPUT_MOVE_FAST
249
+ " Run (Toggle)" , // INPUT_MOVE_FAST_TOGGLE
250
+ " Aim Up" , // INPUT_AIM_UP
251
+ " Aim Down" , // INPUT_AIM_DOWN
252
+ " Aim Left" , // INPUT_AIM_LEFT
253
+ " Aim Right" , // INPUT_AIM_RIGHT
254
+ " Fire/Activate" , // INPUT_FIRE
255
+ " Sharp Aim" , // INPUT_AIM
256
+ " Pie Menu (Analog)" , // INPUT_PIEMENU_ANALOG
257
+ " Pie Menu (Digital)" , // INPUT_PIEMENU_DIGITAL
258
+ " Jump" , // INPUT_JUMP
259
+ " Crouch" , // INPUT_CROUCH
260
+ " Prone" , // INPUT_PRONE
261
+ " Next Body" , // INPUT_NEXT
262
+ " Prev. Body" , // INPUT_PREV
263
+ " Next Device" , // INPUT_WEAPON_CHANGE_NEXT
264
+ " Prev. Device" , // INPUT_WEAPON_CHANGE_PREV
265
+ " Pick Up Device" , // INPUT_WEAPON_PICKUP
266
+ " Drop Device" , // INPUT_WEAPON_DROP
267
+ " Reload Weapon" , // INPUT_WEAPON_RELOAD
268
+ " Primary Weapon Hotkey" , // INPUT_WEAPON_PRIMARY_HOTKEY
269
+ " Auxiliary Weapon Hotkey" , // INPUT_WEAPON_AUXILIARY_HOTKEY
272
270
" Primary Actor Hotkey" , // INPUT_ACTOR_PRIMARY_HOTKEY
273
271
" Auxiliary Actor Hotkey" , // INPUT_ACTOR_AUXILIARY_HOTKEY
274
- " Start" , // INPUT_START
275
- " Back" , // INPUT_BACK
276
- " Analog Aim Up" , // INPUT_R_UP
277
- " Analog Aim Down" , // INPUT_R_DOWN
278
- " Analog Aim Left" , // INPUT_R_LEFT
279
- " Analog Aim Right" // INPUT_R_RIGHT
272
+ " Start" , // INPUT_START
273
+ " Back" , // INPUT_BACK
274
+ " Analog Aim Up" , // INPUT_R_UP
275
+ " Analog Aim Down" , // INPUT_R_DOWN
276
+ " Analog Aim Left" , // INPUT_R_LEFT
277
+ " Analog Aim Right" // INPUT_R_RIGHT
280
278
};
281
279
282
280
// / Enumeration for mouse button types.
@@ -352,18 +350,18 @@ namespace RTE {
352
350
};
353
351
354
352
static const std::unordered_map<std::string_view, Directions> c_DirectionNameToDirectionsMap = {
355
- {" None" , Directions::None},
356
- {" Up" , Directions::Up},
357
- {" Down" , Directions::Down},
358
- {" Left" , Directions::Left},
359
- {" Right" , Directions::Right},
360
- {" Any" , Directions::Any}};
353
+ {" None" , Directions::None},
354
+ {" Up" , Directions::Up},
355
+ {" Down" , Directions::Down},
356
+ {" Left" , Directions::Left},
357
+ {" Right" , Directions::Right},
358
+ {" Any" , Directions::Any}};
361
359
362
360
static const std::unordered_map<Directions, const float > c_DirectionsToRadiansMap = {
363
- {Directions::Up, c_HalfPI},
364
- {Directions::Down, c_OneAndAHalfPI},
365
- {Directions::Left, c_PI},
366
- {Directions::Right, 0 .0F }};
361
+ {Directions::Up, c_HalfPI},
362
+ {Directions::Down, c_OneAndAHalfPI},
363
+ {Directions::Left, c_PI},
364
+ {Directions::Right, 0 .0F }};
367
365
#pragma endregion
368
366
369
367
#pragma region Un - Definitions
0 commit comments