Skip to content

Commit aae2581

Browse files
committed
Source formatting updates
1 parent ec32160 commit aae2581

File tree

12 files changed

+33
-36
lines changed

12 files changed

+33
-36
lines changed

libs/foe_graphics_vk/src/builtin_descriptor_sets.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ class foeGfxVkDescriptorSetLayoutPool;
2020
*/
2121
class foeGfxVkBuiltinDescriptorSets {
2222
public:
23-
auto initialize(VkDevice device,
24-
foeGfxVkDescriptorSetLayoutPool *pDescriptorSetLayoutPool) -> VkResult;
23+
auto initialize(VkDevice device, foeGfxVkDescriptorSetLayoutPool *pDescriptorSetLayoutPool)
24+
-> VkResult;
2525
void deinitialize(VkDevice device);
2626

2727
auto getBuiltinLayout(foeBuiltinDescriptorSetLayoutFlags builtinLayout) const noexcept

libs/foe_graphics_vk/src/render_pass_pool.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@ auto foeGfxVkRenderPassPoolImpl::renderPass(uint32_t attachmentCount,
105105
}
106106

107107
auto foeGfxVkRenderPassPoolImpl::generateCompatibleKeys(
108-
uint32_t attachmentCount,
109-
VkAttachmentDescription const *pAttachments) const -> std::vector<RenderPassCompatibleKey> {
108+
uint32_t attachmentCount, VkAttachmentDescription const *pAttachments) const
109+
-> std::vector<RenderPassCompatibleKey> {
110110
std::vector<RenderPassCompatibleKey> key;
111111
key.reserve(attachmentCount);
112112

@@ -123,8 +123,8 @@ auto foeGfxVkRenderPassPoolImpl::generateCompatibleKeys(
123123
}
124124

125125
auto foeGfxVkRenderPassPoolImpl::generateVariantKeys(
126-
uint32_t attachmentCount,
127-
VkAttachmentDescription const *pAttachments) const -> std::vector<RenderPassVariantKey> {
126+
uint32_t attachmentCount, VkAttachmentDescription const *pAttachments) const
127+
-> std::vector<RenderPassVariantKey> {
128128
std::vector<RenderPassVariantKey> key;
129129
key.reserve(attachmentCount);
130130

libs/foe_graphics_vk/src/render_pass_pool.hpp

+5-4
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ class foeGfxVkRenderPassPoolImpl {
1919
foeResultSet initialize(foeGfxSession session) noexcept;
2020
void deinitialize() noexcept;
2121

22-
auto renderPass(uint32_t attachmentCount,
23-
VkAttachmentDescription const *pAttachments) -> VkRenderPass;
22+
auto renderPass(uint32_t attachmentCount, VkAttachmentDescription const *pAttachments)
23+
-> VkRenderPass;
2424

2525
auto renderPass(uint32_t attachmentCount,
2626
VkFormat const *pFormats,
@@ -70,8 +70,9 @@ class foeGfxVkRenderPassPoolImpl {
7070
auto generateCompatibleKeys(uint32_t attachmentCount,
7171
VkAttachmentDescription const *pAttachments) const
7272
-> std::vector<RenderPassCompatibleKey>;
73-
auto generateVariantKeys(uint32_t attachmentCount, VkAttachmentDescription const *pAttachments)
74-
const -> std::vector<RenderPassVariantKey>;
73+
auto generateVariantKeys(uint32_t attachmentCount,
74+
VkAttachmentDescription const *pAttachments) const
75+
-> std::vector<RenderPassVariantKey>;
7576

7677
auto findRenderPass(std::vector<RenderPassCompatibleKey> const &compatibleKey,
7778
std::vector<RenderPassVariantKey> const &variantKey) -> VkRenderPass;

libs/foe_graphics_vk/src/render_target.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -305,8 +305,8 @@ auto foeGfxVkGetRenderTargetImage(foeGfxRenderTarget renderTarget, uint32_t inde
305305
return pRenderTarget->images[offset + pRenderTarget->indices[index]].image;
306306
}
307307

308-
auto foeGfxVkGetRenderTargetImageView(foeGfxRenderTarget renderTarget,
309-
uint32_t index) -> VkImageView {
308+
auto foeGfxVkGetRenderTargetImageView(foeGfxRenderTarget renderTarget, uint32_t index)
309+
-> VkImageView {
310310
auto *pRenderTarget = render_target_from_handle(renderTarget);
311311

312312
uint32_t offset = 0;

libs/foe_model/include/foe/model/importer.hpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,13 @@ class foeModelImporter {
5252

5353
virtual void importMeshIndexData16(unsigned int mesh, uint16_t offset, uint16_t *pData) = 0;
5454

55-
virtual auto importMeshIndexData16(unsigned int mesh,
56-
uint16_t offset) -> std::vector<uint16_t> = 0;
55+
virtual auto importMeshIndexData16(unsigned int mesh, uint16_t offset)
56+
-> std::vector<uint16_t> = 0;
5757

5858
virtual void importMeshIndexData32(unsigned int mesh, uint32_t offset, uint32_t *pData) = 0;
5959

60-
virtual auto importMeshIndexData32(unsigned int mesh,
61-
uint32_t offset) -> std::vector<uint32_t> = 0;
60+
virtual auto importMeshIndexData32(unsigned int mesh, uint32_t offset)
61+
-> std::vector<uint32_t> = 0;
6262

6363
virtual auto getMeshVerticesByWeight(unsigned int mesh) -> std::vector<int> = 0;
6464

libs/foe_model_assimp/src/importer.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ void foeModelAssimpImporter::importMeshIndexData16(unsigned int mesh,
8181
::importMeshIndexData16(mpScene->mMeshes[mesh], offset, pData);
8282
}
8383

84-
auto foeModelAssimpImporter::importMeshIndexData16(unsigned int mesh,
85-
uint16_t offset) -> std::vector<uint16_t> {
84+
auto foeModelAssimpImporter::importMeshIndexData16(unsigned int mesh, uint16_t offset)
85+
-> std::vector<uint16_t> {
8686
return ::importMeshIndexData16(mpScene->mMeshes[mesh], offset);
8787
}
8888

@@ -92,8 +92,8 @@ void foeModelAssimpImporter::importMeshIndexData32(unsigned int mesh,
9292
::importMeshIndexData32(mpScene->mMeshes[mesh], offset, pData);
9393
}
9494

95-
auto foeModelAssimpImporter::importMeshIndexData32(unsigned int mesh,
96-
uint32_t offset) -> std::vector<uint32_t> {
95+
auto foeModelAssimpImporter::importMeshIndexData32(unsigned int mesh, uint32_t offset)
96+
-> std::vector<uint32_t> {
9797
return ::importMeshIndexData32(mpScene->mMeshes[mesh], offset);
9898
}
9999

libs/foe_physics/libs/yaml/src/rigid_body.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88

99
char const *yaml_rigid_body_key() { return "rigid_body"; }
1010

11-
auto yaml_read_rigid_body(YAML::Node const &node,
12-
foeEcsGroupTranslator groupTranslator) -> foeRigidBody {
11+
auto yaml_read_rigid_body(YAML::Node const &node, foeEcsGroupTranslator groupTranslator)
12+
-> foeRigidBody {
1313
foeRigidBody rigidBody = {};
1414

1515
yaml_read_foeRigidBody("", node, groupTranslator, rigidBody);

libs/foe_physics/libs/yaml/src/rigid_body.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212
char const *yaml_rigid_body_key();
1313

14-
auto yaml_read_rigid_body(YAML::Node const &node,
15-
foeEcsGroupTranslator groupTranslator) -> foeRigidBody;
14+
auto yaml_read_rigid_body(YAML::Node const &node, foeEcsGroupTranslator groupTranslator)
15+
-> foeRigidBody;
1616

1717
auto yaml_write_rigid_body(foeRigidBody const &data) -> YAML::Node;
1818

src/settings.cpp

+2-4
Original file line numberDiff line numberDiff line change
@@ -194,10 +194,8 @@ void emitSettingsYaml(Settings const *pOptions, YAML::Node *pNode) {
194194

195195
} // namespace
196196

197-
auto loadSettings(int argc,
198-
char **argv,
199-
Settings &settings,
200-
foeSearchPaths &searchPaths) -> std::tuple<bool, int> {
197+
auto loadSettings(int argc, char **argv, Settings &settings, foeSearchPaths &searchPaths)
198+
-> std::tuple<bool, int> {
201199
std::string cfgFile = "foe-settings.yml";
202200

203201
{ // Load settings from command line

src/settings.hpp

+2-4
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,8 @@ struct Settings {
3737
};
3838

3939
/// Returns two items, a boolean on whether to continue the program, and code to return with.
40-
auto loadSettings(int argc,
41-
char **argv,
42-
Settings &settings,
43-
foeSearchPaths &searchPaths) -> std::tuple<bool, int>;
40+
auto loadSettings(int argc, char **argv, Settings &settings, foeSearchPaths &searchPaths)
41+
-> std::tuple<bool, int>;
4442

4543
bool saveSettings(Settings const &settings);
4644

src/simulation/armature_state_imex.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313

1414
inline char const *yaml_armature_state_key() { return "armature_state"; }
1515

16-
inline auto yaml_read_ArmatureState(YAML::Node const &node,
17-
foeEcsGroupTranslator groupTranslator) -> foeArmatureState {
16+
inline auto yaml_read_ArmatureState(YAML::Node const &node, foeEcsGroupTranslator groupTranslator)
17+
-> foeArmatureState {
1818
foeArmatureState armatureState;
1919

2020
yaml_read_foeArmatureState("", node, groupTranslator, armatureState);

src/simulation/render_state_imex.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313

1414
inline char const *yaml_render_state_key() { return "render_state"; }
1515

16-
inline auto yaml_read_RenderState(YAML::Node const &node,
17-
foeEcsGroupTranslator groupTranslator) -> foeRenderState {
16+
inline auto yaml_read_RenderState(YAML::Node const &node, foeEcsGroupTranslator groupTranslator)
17+
-> foeRenderState {
1818
foeRenderState renderState;
1919

2020
yaml_read_foeRenderState("", node, groupTranslator, renderState);

0 commit comments

Comments
 (0)