Skip to content

Commit 5b0a045

Browse files
clang-format Microsoft style
1 parent 6b64e1b commit 5b0a045

5 files changed

Lines changed: 12 additions & 15 deletions

File tree

CMakePresets.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
},
88
"configurePresets":[
99
{
10-
"name": "debug",
10+
"name": "Debug",
1111
"displayName": "Default Config Ninja Debug",
1212
"generator": "Ninja",
1313
"binaryDir": "${sourceDir}/../builds/RendererEngine",
@@ -59,8 +59,8 @@
5959
}
6060
},
6161
{
62-
"name": "release",
63-
"inherits": "debug",
62+
"name": "Release",
63+
"inherits": "Debug",
6464
"displayName": "Default Config Ninja Release",
6565
"cacheVariables": {
6666
"CMAKE_BUILD_TYPE": "Debug"
@@ -69,12 +69,12 @@
6969
],
7070
"buildPresets": [
7171
{
72-
"name": "debug",
73-
"configurePreset": "debug"
72+
"name": "Debug",
73+
"configurePreset": "Debug"
7474
},
7575
{
76-
"name": "release",
77-
"configurePreset": "release"
76+
"name": "Release",
77+
"configurePreset": "Release"
7878
}
7979
]
8080
}

Scripts/BuildEngine.ps1

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,6 @@ function Build([string]$configuration, [int]$VsVersion , [bool]$runBuild) {
9797
#
9898
if ($runBuild) {
9999
$buildArguments = "--build --preset $Configuration"
100-
if ($buildToolOptions) {
101-
$buildArguments = $buildArguments, $buildToolOptions -join " --"
102-
}
103100

104101
$buildProcess = Start-Process $cMakeProgram -ArgumentList $buildArguments -NoNewWindow -PassThru
105102

Scripts/ClangFormat.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ $srcFiles = $srcFiles | ForEach-Object { $_.FullName }
4545

4646
Write-Host "Running clang-format on $SourceDirectory..."
4747

48-
[string[]] $clangFormatArgument = "-i", "--ferror-limit=0", "-fallback-style=none", "--style=file"
48+
[string[]] $clangFormatArgument = "-i", "--ferror-limit=0", "-fallback-style=Microsoft", "--style=file"
4949

5050
if ($RunAsCheck) {
5151
$clangFormatArgument += "--dry-run", "--Werror"
@@ -63,4 +63,4 @@ if ($exitCode -ne 0) {
6363
}
6464
else {
6565
Write-Host "clang-format source formatting succeeded"
66-
}
66+
}

ZEngine/ZEngine/Core/CoroutineScheduler.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace ZEngine::Core
1515
ReadyCallback Ready = nullptr;
1616
ExecuteCallback Action = nullptr;
1717

18-
operator bool() noexcept
18+
operator bool() noexcept
1919
{
2020
return (Ready && Action);
2121
}

ZEngine/ZEngine/Hardwares/VulkanDevice.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ namespace ZEngine::Hardwares
7272
VkBuffer Handle = VK_NULL_HANDLE;
7373
VmaAllocation Allocation = nullptr;
7474

75-
operator bool() const
75+
operator bool() const
7676
{
7777
return (Handle != VK_NULL_HANDLE);
7878
}
@@ -86,7 +86,7 @@ namespace ZEngine::Hardwares
8686
VkSampler Sampler{VK_NULL_HANDLE};
8787
VmaAllocation Allocation{nullptr};
8888

89-
operator bool() const
89+
operator bool() const
9090
{
9191
return (Handle != VK_NULL_HANDLE);
9292
}

0 commit comments

Comments
 (0)