Skip to content

Commit 988349a

Browse files
ArthurHubArthurHub
committed
chore: update formatting rules in .clang-format and run on all files
1 parent c807372 commit 988349a

18 files changed

Lines changed: 177 additions & 75 deletions

‎.clang-format‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
---
1+
---
22
Language: Cpp
33
BasedOnStyle: LLVM
44
AccessModifierOffset: -4
@@ -8,7 +8,7 @@ AlignConsecutiveBitFields: false
88
AlignConsecutiveDeclarations: false
99
AlignConsecutiveMacros: false
1010
AlignEscapedNewlines: Left
11-
AlignOperands: false
11+
AlignOperands: Align
1212
AlignTrailingComments: false
1313
AllowAllArgumentsOnNextLine: false
1414
AllowAllConstructorInitializersOnNextLine: false
@@ -18,7 +18,7 @@ AllowShortCaseLabelsOnASingleLine: false
1818
AllowShortEnumsOnASingleLine: true
1919
AllowShortFunctionsOnASingleLine: None
2020
AllowShortIfStatementsOnASingleLine: false
21-
AllowShortLambdasOnASingleLine: All
21+
AllowShortLambdasOnASingleLine: None
2222
AllowShortLoopsOnASingleLine: false
2323
AlwaysBreakAfterDefinitionReturnType: false
2424
AlwaysBreakAfterReturnType: None
@@ -87,6 +87,7 @@ MaxEmptyLinesToKeep: 1
8787
NamespaceIndentation: All
8888
PointerAlignment: Left
8989
ReflowComments: false
90+
SeparateDefinitionBlocks: Always
9091
SortIncludes: true
9192
SortUsingDeclarations: true
9293
SpaceAfterCStyleCast: false

‎src/Config.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,14 +112,17 @@ namespace frik
112112
bool hideHead = false;
113113
bool hideHeadEquipment = false;
114114
bool hideSkin = false;
115+
115116
const std::vector<std::string>& faceGeometry() const
116117
{
117118
return _faceGeometry;
118119
}
120+
119121
const std::vector<std::string>& skinGeometry() const
120122
{
121123
return _skinGeometry;
122124
}
125+
123126
const std::vector<int>& hideEquipSlotIndexes() const
124127
{
125128
return _hideEquipSlotIndexes;

‎src/FRIK.h‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,17 @@ namespace frik
3333
{
3434
return _gameMenusHandler.isInScopeMenu();
3535
}
36+
3637
bool isPauseMenuOpen()
3738
{
3839
return _gameMenusHandler.isPauseMenuOpen();
3940
}
41+
4042
bool isFavoritesMenuOpen()
4143
{
4244
return _gameMenusHandler.isFavoritesMenuOpen();
4345
}
46+
4447
bool isDialogueMenuOpen()
4548
{
4649
return _gameMenusHandler.isDialogueMenuOpen();
@@ -50,22 +53,27 @@ namespace frik
5053
{
5154
return _selfieMode;
5255
}
56+
5357
void setSelfieMode(const bool selfieMode)
5458
{
5559
_selfieMode = selfieMode;
5660
}
61+
5762
float getDynamicCameraHeight() const
5863
{
5964
return _dynamicCameraHeight;
6065
}
66+
6167
void setDynamicCameraHeight(const float dynamicCameraHeight)
6268
{
6369
_dynamicCameraHeight = dynamicCameraHeight;
6470
}
71+
6572
bool isLookingThroughScope() const
6673
{
6774
return _isLookingThroughScope;
6875
}
76+
6977
void setLookingThroughScope(const bool isLookingThroughScope)
7078
{
7179
_isLookingThroughScope = isLookingThroughScope;
@@ -75,16 +83,19 @@ namespace frik
7583
{
7684
return _pipboy && _pipboy->isOpen();
7785
}
86+
7887
bool isPipboyOperatingWithFinger() const
7988
{
8089
return _pipboy && _pipboy->isOperatingWithFinger();
8190
}
91+
8292
void swapPipboyModel() const
8393
{
8494
if (_pipboy) {
8595
_pipboy->swapModel();
8696
}
8797
}
98+
8899
void closePipboy() const
89100
{
90101
if (_pipboy) {
@@ -96,14 +107,17 @@ namespace frik
96107
{
97108
return _mainConfigMode.isOpen();
98109
}
110+
99111
bool isPipboyConfigurationModeActive() const
100112
{
101113
return _pipboyConfigMode && _pipboyConfigMode->isPipBoyConfigModeActive();
102114
}
115+
103116
bool isPipboyConfigurationModeAdjusting() const
104117
{
105118
return _pipboyConfigMode && _pipboyConfigMode->isAdjusting();
106119
}
120+
107121
void openMainConfigurationModeActive()
108122
{
109123
_mainConfigMode.openConfigMode();
@@ -135,14 +149,17 @@ namespace frik
135149
{
136150
return _weaponPosition && _weaponPosition->isMeleeWeaponDrawn();
137151
}
152+
138153
bool isOffHandGrippingWeapon() const
139154
{
140155
return _weaponPosition && _weaponPosition->isOffHandGrippingWeapon();
141156
}
157+
142158
bool isOffHandGrippingEnabled() const
143159
{
144160
return WeaponPositionAdjuster::isOffHandGrippingEnabled();
145161
}
162+
146163
void setOffHandGrippingEnabled(const bool enabled)
147164
{
148165
WeaponPositionAdjuster::setOffHandGrippingEnabled(enabled);
@@ -152,6 +169,7 @@ namespace frik
152169
{
153170
return _weaponPosition && _weaponPosition->inWeaponRepositionMode();
154171
}
172+
155173
void toggleWeaponRepositionMode() const
156174
{
157175
// reposition mode is unavailable while weapon positioning is disabled via API
@@ -166,14 +184,17 @@ namespace frik
166184
{
167185
return _flashlightEnabled;
168186
}
187+
169188
void setFlashlightEnabled(const bool enabled)
170189
{
171190
_flashlightEnabled = enabled;
172191
}
192+
173193
bool isWeaponPositionEnabled() const
174194
{
175195
return _weaponPositionEnabled;
176196
}
197+
177198
void setWeaponPositionEnabled(const bool enabled)
178199
{
179200
_weaponPositionEnabled = enabled;
@@ -182,10 +203,12 @@ namespace frik
182203
_weaponPosition->resetOnDisable();
183204
}
184205
}
206+
185207
bool isPipboyEnabled() const
186208
{
187209
return _pipboyEnabled;
188210
}
211+
189212
void setPipboyEnabled(const bool enabled)
190213
{
191214
_pipboyEnabled = enabled;
@@ -194,10 +217,12 @@ namespace frik
194217
_pipboy->resetOnDisable();
195218
}
196219
}
220+
197221
bool isSmoothMovementEnabled() const
198222
{
199223
return _smoothMovementEnabled;
200224
}
225+
201226
void setSmoothMovementEnabled(const bool enabled)
202227
{
203228
_smoothMovementEnabled = enabled;

‎src/config-mode/BodyAdjustmentSubConfigMode.cpp‎

Lines changed: 27 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -54,31 +54,39 @@ namespace frik
5454
{
5555
const auto playSeattedBtn = std::make_shared<UIToggleButton>("ui-config-main\\btn-play-seated.nif");
5656
playSeattedBtn->setToggleState(g_config.isPlayingSeated);
57-
playSeattedBtn->setOnToggleHandler([this](UIWidget*, const bool enabled) { togglePlayingSeated(enabled); });
57+
playSeattedBtn->setOnToggleHandler([this](UIWidget*, const bool enabled) {
58+
togglePlayingSeated(enabled);
59+
});
5860

5961
const auto hideHeadBtn = std::make_shared<UIToggleButton>("ui-config-main\\btn-hide-head.nif");
6062
hideHeadBtn->setToggleState(g_config.hideHeadEquipment);
61-
hideHeadBtn->setOnToggleHandler([this](UIWidget*, const bool enabled) { toggleHideHeadEquipment(enabled); });
63+
hideHeadBtn->setOnToggleHandler([this](UIWidget*, const bool enabled) {
64+
toggleHideHeadEquipment(enabled);
65+
});
6266

6367
const auto row1Container = std::make_shared<UIContainer>("Row1", UIContainerLayout::HorizontalCenter, 0.5f);
6468
row1Container->addElement(playSeattedBtn);
6569
row1Container->addElement(hideHeadBtn);
6670

6771
const auto heightToggleBtn = std::make_shared<UIToggleButton>("ui-config-main\\btn-body-vertical.nif");
68-
heightToggleBtn->setOnToggleHandler(
69-
[this](UIWidget*, const bool enabled) { _configTarget = enabled ? BodyAdjustmentConfigTarget::BodyHeight : BodyAdjustmentConfigTarget::None; });
72+
heightToggleBtn->setOnToggleHandler([this](UIWidget*, const bool enabled) {
73+
_configTarget = enabled ? BodyAdjustmentConfigTarget::BodyHeight : BodyAdjustmentConfigTarget::None;
74+
});
7075

7176
const auto forwardToggleBtn = std::make_shared<UIToggleButton>("ui-config-main\\btn-body-forward.nif");
72-
forwardToggleBtn->setOnToggleHandler(
73-
[this](UIWidget*, const bool enabled) { _configTarget = enabled ? BodyAdjustmentConfigTarget::BodyForwardOffset : BodyAdjustmentConfigTarget::None; });
77+
forwardToggleBtn->setOnToggleHandler([this](UIWidget*, const bool enabled) {
78+
_configTarget = enabled ? BodyAdjustmentConfigTarget::BodyForwardOffset : BodyAdjustmentConfigTarget::None;
79+
});
7480

7581
const auto armsLengthToggleBtn = std::make_shared<UIToggleButton>("ui-config-main\\btn-arms-length.nif");
76-
armsLengthToggleBtn->setOnToggleHandler(
77-
[this](UIWidget*, const bool enabled) { _configTarget = enabled ? BodyAdjustmentConfigTarget::BodyArmsLength : BodyAdjustmentConfigTarget::None; });
82+
armsLengthToggleBtn->setOnToggleHandler([this](UIWidget*, const bool enabled) {
83+
_configTarget = enabled ? BodyAdjustmentConfigTarget::BodyArmsLength : BodyAdjustmentConfigTarget::None;
84+
});
7885

7986
const auto vrScaleToggleBtn = std::make_shared<UIToggleButton>("ui-config-main\\btn-vr-scale.nif");
80-
vrScaleToggleBtn->setOnToggleHandler(
81-
[this](UIWidget*, const bool enabled) { _configTarget = enabled ? BodyAdjustmentConfigTarget::VRScale : BodyAdjustmentConfigTarget::None; });
87+
vrScaleToggleBtn->setOnToggleHandler([this](UIWidget*, const bool enabled) {
88+
_configTarget = enabled ? BodyAdjustmentConfigTarget::VRScale : BodyAdjustmentConfigTarget::None;
89+
});
8290

8391
_row2Container = std::make_shared<UIToggleGroupContainer>("Row2", UIContainerLayout::HorizontalCenter, 0.3f);
8492
_row2Container->addElement(heightToggleBtn);
@@ -93,13 +101,19 @@ namespace frik
93101
vrScaleToggleBtn->setUnToggleAllowed(true);
94102

95103
_saveBtn = std::make_shared<UIButton>("ui-common\\btn-save.nif");
96-
_saveBtn->setOnPressHandler([this](UIWidget*) { saveConfig(); });
104+
_saveBtn->setOnPressHandler([this](UIWidget*) {
105+
saveConfig();
106+
});
97107

98108
_resetBtn = std::make_shared<UIButton>("ui-common\\btn-reset.nif");
99-
_resetBtn->setOnPressHandler([this](UIWidget*) { resetConfig(); });
109+
_resetBtn->setOnPressHandler([this](UIWidget*) {
110+
resetConfig();
111+
});
100112

101113
const auto exitBtn = std::make_shared<UIButton>("ui-common\\btn-back.nif");
102-
exitBtn->setOnPressHandler([this](UIWidget*) { closeConfig(); });
114+
exitBtn->setOnPressHandler([this](UIWidget*) {
115+
closeConfig();
116+
});
103117

104118
const auto row3Container = std::make_shared<UIContainer>("Row3", UIContainerLayout::HorizontalCenter, 0.3f);
105119
row3Container->addElement(_saveBtn);

‎src/config-mode/BodyAdjustmentSubConfigMode.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ namespace frik
2424
explicit BodyAdjustmentSubConfigMode(const std::function<void()>& onClose);
2525

2626
void onFrameUpdate() const;
27+
2728
static void updateLegSlack(const float skeletonLegSlack)
2829
{
2930
_skeletonLegSlack = skeletonLegSlack;

‎src/config-mode/MainConfigMode.cpp‎

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,15 @@ namespace frik
8888
void MainConfigMode::createMainConfigUI()
8989
{
9090
const auto openBodyConfigBtn = std::make_shared<UIButton>("ui-config-main\\btn-body-config.nif");
91-
openBodyConfigBtn->setOnPressHandler([this](UIWidget*) { openBodyAdjustmentSubConfigUI(); });
91+
openBodyConfigBtn->setOnPressHandler([this](UIWidget*) {
92+
openBodyAdjustmentSubConfigUI();
93+
});
9294

9395
const auto dampenHandsBtn = std::make_shared<UIToggleButton>("ui-config-main\\btn-dampen-hands.nif");
9496
dampenHandsBtn->setToggleState(g_config.dampenHands);
95-
dampenHandsBtn->setOnToggleHandler([this](UIWidget*, const bool enabled) { g_config.saveDampenHands(enabled); });
97+
dampenHandsBtn->setOnToggleHandler([this](UIWidget*, const bool enabled) {
98+
g_config.saveDampenHands(enabled);
99+
});
96100

97101
const auto row1Container = std::make_shared<UIContainer>("Row1", UIContainerLayout::HorizontalCenter, 0.3f);
98102
row1Container->addElement(openBodyConfigBtn);
@@ -106,7 +110,9 @@ namespace frik
106110
{ TwoHandedGripMode::Mode4, "ui-config-main\\btn-grip-mode-4.nif" } };
107111
const auto twoHandedGripModeBtn = std::make_shared<UIMultiStateToggleButton<TwoHandedGripMode>>(gripModesMap);
108112
twoHandedGripModeBtn->setState(getTwoHandedGripMode());
109-
twoHandedGripModeBtn->setOnStateChangedHandler([this](UIWidget*, const TwoHandedGripMode mode) { updateTwoHandedGripMode(mode); });
113+
twoHandedGripModeBtn->setOnStateChangedHandler([this](UIWidget*, const TwoHandedGripMode mode) {
114+
updateTwoHandedGripMode(mode);
115+
});
110116
row1Container->addElement(twoHandedGripModeBtn);
111117
}
112118

@@ -115,26 +121,36 @@ namespace frik
115121
// hide a sub-config button when its feature is disabled via API as its config is not relevant
116122
if (g_frik.isPipboyEnabled()) {
117123
const auto openPipboyConfigBtn = std::make_shared<UIButton>("ui-config-main\\btn-pipboy-config.nif");
118-
openPipboyConfigBtn->setOnPressHandler([this](UIWidget*) { openPipboyConfigUI(); });
124+
openPipboyConfigBtn->setOnPressHandler([this](UIWidget*) {
125+
openPipboyConfigUI();
126+
});
119127
row2Container->addElement(openPipboyConfigBtn);
120128
}
121129
if (g_frik.isWeaponPositionEnabled()) {
122130
const auto openWeaponAdjustConfigBtn = std::make_shared<UIButton>("ui-config-main\\btn-weapon-adjust.nif");
123-
openWeaponAdjustConfigBtn->setOnPressHandler([this](UIWidget*) { openWeaponAdjustConfigUI(); });
131+
openWeaponAdjustConfigBtn->setOnPressHandler([this](UIWidget*) {
132+
openWeaponAdjustConfigUI();
133+
});
124134
row2Container->addElement(openWeaponAdjustConfigBtn);
125135
}
126136

127137
for (const auto& buttonData : _externalModConfigButtonDataList) {
128138
const auto openExtModConfigBtn = std::make_shared<UIButton>(buttonData.buttonIconNifPath);
129-
openExtModConfigBtn->setOnPressHandler([this, buttonData](UIWidget*) { openExternalModConfig(buttonData); });
139+
openExtModConfigBtn->setOnPressHandler([this, buttonData](UIWidget*) {
140+
openExternalModConfig(buttonData);
141+
});
130142
row2Container->addElement(openExtModConfigBtn);
131143
}
132144

133145
const auto advancedConfigBtn = std::make_shared<UIButton>("ui-common\\btn-advanced-config.nif");
134-
advancedConfigBtn->setOnPressHandler([](UIWidget*) { openAdvancedConfig(); });
146+
advancedConfigBtn->setOnPressHandler([](UIWidget*) {
147+
openAdvancedConfig();
148+
});
135149

136150
const auto exitBtn = std::make_shared<UIButton>("ui-common\\btn-exit.nif");
137-
exitBtn->setOnPressHandler([this](UIWidget*) { closeMainConfigMode(); });
151+
exitBtn->setOnPressHandler([this](UIWidget*) {
152+
closeMainConfigMode();
153+
});
138154

139155
const auto row3Container = std::make_shared<UIContainer>("Row3", UIContainerLayout::HorizontalCenter, 0.3f);
140156
row3Container->addElement(advancedConfigBtn);
@@ -168,7 +184,9 @@ namespace frik
168184
logger::error("Body adjust config class is already initialized");
169185
return;
170186
}
171-
_bodyAdjustmentSubConfig = std::make_shared<BodyAdjustmentSubConfigMode>([this]() { _bodyAdjustmentSubConfig.reset(); });
187+
_bodyAdjustmentSubConfig = std::make_shared<BodyAdjustmentSubConfigMode>([this]() {
188+
_bodyAdjustmentSubConfig.reset();
189+
});
172190
}
173191

174192
/**

0 commit comments

Comments
 (0)