Skip to content

Commit 331da1b

Browse files
committed
Style: Remove trailing whitespaces
1 parent 3970dd9 commit 331da1b

File tree

223 files changed

+672
-673
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

223 files changed

+672
-673
lines changed

.github/workflows/mirror.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ jobs:
1414
with:
1515
target_repo_url: [email protected]:OpenXRay/xray-16.git
1616
ssh_private_key: ${{ secrets.RABOTYAGA_BITBUCKET_PRIVATE_SSH_KEY }}
17-
17+

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ branches:
55
except:
66
- /^dependabot\/.*$/
77

8-
os: linux
8+
os: linux
99
dist: focal
1010
virt: lxd
1111
group: edge

License.txt

+17-17
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
All source code included with this distribution, unless declared otherwise,
2-
is commercial GSC Game World proprietary code.
1+
All source code included with this distribution, unless declared otherwise,
2+
is commercial GSC Game World proprietary code.
33

4-
Redistribution and use in source and binary forms, with or without
5-
modification, are permitted provided that the following conditions are met:
4+
Redistribution and use in source and binary forms, with or without
5+
modification, are permitted provided that the following conditions are met:
66

7-
1. Redistributions of source code must retain the above copyright notice, this
8-
list of conditions and the following disclaimer.
7+
1. Redistributions of source code must retain the above copyright notice, this
8+
list of conditions and the following disclaimer.
99

10-
2. Redistributions in binary form must reproduce the above copyright notice,
11-
this list of conditions and the following disclaimer in the documentation
12-
and/or other materials provided with the distribution.
10+
2. Redistributions in binary form must reproduce the above copyright notice,
11+
this list of conditions and the following disclaimer in the documentation
12+
and/or other materials provided with the distribution.
1313

14-
3. Neither binary nor source code redistributions may be used for any
15-
commercial purposes.
14+
3. Neither binary nor source code redistributions may be used for any
15+
commercial purposes.
1616

17-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
18-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
19-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
20-
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
21-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
22-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
17+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
18+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
19+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
20+
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
21+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
22+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2323
THE SOFTWARE.

cmake/FindLZO.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ FIND_LIBRARY(LZO_LIBRARY
5151
lib64 lib
5252
)
5353

54-
# handle the QUIETLY and REQUIRED arguments and set LZO_FOUND to TRUE if
54+
# handle the QUIETLY and REQUIRED arguments and set LZO_FOUND to TRUE if
5555
# all listed variables are TRUE
5656
INCLUDE(FindPackageHandleStandardArgs)
5757
FIND_PACKAGE_HANDLE_STANDARD_ARGS(LZO DEFAULT_MSG

doc/design/task_history.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ TITLE: X-Ray Engine 1.6 task history
55
nitrocaster: Pavel Kovalenko
66
+ get rid of STLPort
77
+ bugs
8-
+ fix lights_hanging_lamp class name in system.ltx (used 'SO_HLAMP', should be 'O_HLAMP')
8+
+ fix lights_hanging_lamp class name in system.ltx (used 'SO_HLAMP', should be 'O_HLAMP')
99
+ core
1010
+ xrMemory::mem_usage -> mem_usage_impl falls into infinite loop or finds bad nodes
1111
+ stackoverflow when game directory contains too many files (_alloca)

doc/design/task_list.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ Highflex: Alex M
162162
- Python scripts for stalker skeleton control rig creation
163163
- game code
164164
- Improve Weapon System ( Additional Animations, Options )
165-
165+
166166
Swartz27: Matthew Swartz
167167
+ Fix blurred text on R4
168168
+ Fix issue #24: Fix overloaded particle system

doc/procedure/cpp_code.txt

+14-14
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,7 @@ its empty inline implementation after the class definition:
500500
public:
501501
virtual ~IServer() = 0;
502502
};
503-
503+
504504
inline IServer::~IServer() {}
505505

506506
Do not mark interface classes with linkage attributes.
@@ -635,9 +635,9 @@ across compilers.
635635
BAD
636636
#ifndef _XRAY_HPP_
637637
#define _XRAY_HPP_
638-
638+
639639
// The XRay.hpp content comes here
640-
640+
641641
#endif // _XRAY_HPP_
642642
GOOD
643643
#pragma once
@@ -773,15 +773,15 @@ that flags can be grouped under another one new flag:
773773
#if !defined(DEDICATED_SERVER) && defined(CONFIG_SHOW_LOGO_WINDOW)
774774
DestroyWindow(logoWindow);
775775
#endif
776-
776+
777777
Use using instead of typedef:
778778
BAD
779779
typedef void (*FunctionType)(double);
780780
typedef Vector3<float> vector3f;
781781
GOOD
782782
using FunctionType = void (*)(double);
783783
using vector3f = Vector3<float>;
784-
784+
785785
Use strongly typed enums instead of plain C enums:
786786
BAD
787787
enum CmdStatus
@@ -797,7 +797,7 @@ Use strongly typed enums instead of plain C enums:
797797
InProgress,
798798
Failed,
799799
};
800-
800+
801801
Enums that can be serialized should have values assigned:
802802
BAD
803803
enum class CmdStatus
@@ -919,7 +919,7 @@ code fragments, put a comment line.
919919
BAD
920920
for (auto &item : items)
921921
storage.push_back(item);
922-
922+
923923
if (!storage.size())
924924
Log("! ERROR: No items found");
925925
GOOD
@@ -945,15 +945,15 @@ compiles standalone without any dependency on includes before it.
945945
#pragma once
946946
#include "Config.hpp"
947947
... Put here minimal includes required by Foo.hpp ...
948-
948+
949949
... Put here your declarations ...
950-
950+
951951
Foo.cpp template
952952
------------------------------
953953
#include "Config.hpp"
954954
#include "Foo.hpp"
955955
... Put here minimal includes required by Foo.cpp ...
956-
956+
957957
... Put here your code ...
958958

959959
GOOD (using precompiled headers)
@@ -962,22 +962,22 @@ compiles standalone without any dependency on includes before it.
962962
#pragma once
963963
#include "Config.hpp"
964964
... Put here additional includes ...
965-
965+
966966
Foo.hpp template
967967
------------------------------
968968
#pragma once
969969
#include "Config.hpp"
970970
... Put here minimal includes required by Foo.hpp ...
971-
971+
972972
... Put here your declarations ...
973-
973+
974974
Foo.cpp template
975975
------------------------------
976976
#include "stdafx.hpp"
977977
#include "Config.hpp"
978978
#include "Foo.hpp"
979979
... Put here minimal includes required by Foo.cpp ...
980-
980+
981981
... Put here your code ...
982982

983983
Use #include "Foo.hpp" for headers in the same directory as the source

misc/docker/how-to.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Then start a new terminal session (or reboot the machine).
1414
Download and install [Docker Desktop](https://download.docker.com/mac/stable/Docker.dmg).
1515

1616
## Create container
17-
Navigate to directory `xray-16/docker` and run the following to create
17+
Navigate to directory `xray-16/docker` and run the following to create
1818
container:
1919
```shell script
2020
bash create.sh
@@ -54,7 +54,7 @@ User `user` is used for integration with CLion, don't try to log in as him manua
5454
- In CLion:
5555
1. Open `xray-16` project
5656
2. In `Preferences/Settings` > `Build, Execution, Deployment` > `Toolchains`
57-
create Remote Host and fill paths to the tools (compiler, cmake and
57+
create Remote Host and fill paths to the tools (compiler, cmake and
5858
so on) like on the screenshot below:
5959
![Setup toolchain](pics/toolchain.png)
6060
```
@@ -63,7 +63,7 @@ User `user` is used for integration with CLion, don't try to log in as him manua
6363
```
6464
![Insert credentials](pics/credentials.png)
6565

66-
3. In `Preferences/Settings` > `Build, Execution, Deployment` > `CMake`
66+
3. In `Preferences/Settings` > `Build, Execution, Deployment` > `CMake`
6767
choose `Toolchain` – created above Remote Host:
6868

6969
![Setup cmake](pics/cmake.png)

src/Common/NvMender2003/ReadMe.txt

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
========================================================================
2-
STATIC LIBRARY : nv_meshmender
2+
STATIC LIBRARY : nv_meshmender
33
========================================================================
44

55
revision history
@@ -13,5 +13,4 @@ revision history
1313
- renamed MeshMender::MenderVertex to MeshMender::Vertex since the extra mender was redundant
1414
- added some more comments in the options section with advice on usage
1515
- turned bool parameters into enums so that they aren't easily mixed up.
16-
17-
16+

src/Common/PlatformApple.inl

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ inline void _splitpath(const char* path, // Path Input
7878
{
7979
if(!path)
8080
return;
81-
81+
8282
const char *p, *end;
8383

8484
if(drive)

src/Common/PlatformBSD.inl

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ inline void _splitpath(const char* path, // Path Input
7676
{
7777
if(!path)
7878
return;
79-
79+
8080
const char *p, *end;
8181

8282
if(drive)

src/Common/PlatformLinux.inl

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ inline void _splitpath(const char* path, // Path Input
7777
{
7878
if(!path)
7979
return;
80-
80+
8181
const char *p, *end;
8282

8383
if(drive)

src/Layers/xrRender/D3DXRenderBase.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ void D3DXRenderBase::OnDeviceCreate(const char* shName)
169169
m_WireShader.create("editor" DELIMITER "wire");
170170
m_SelectionShader.create("editor" DELIMITER "selection");
171171
m_PortalFadeShader.create("portal");
172-
m_PortalFadeGeom.create(FVF::F_L, RImplementation.Vertex.Buffer(), 0);
172+
m_PortalFadeGeom.create(FVF::F_L, RImplementation.Vertex.Buffer(), 0);
173173
DUImpl.OnDeviceCreate();
174174
UIRenderImpl.CreateUIGeom();
175175
}

src/Layers/xrRender/DetailManager.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -110,15 +110,15 @@ CDetailManager::CDetailManager() : xrc("detail manager")
110110
cache = (Slot***)xr_malloc(dm_cache_line * sizeof(Slot**));
111111
for (u32 i = 0; i < dm_cache_line; ++i)
112112
cache[i] = (Slot**)xr_malloc(dm_cache_line * sizeof(Slot*));
113-
113+
114114
cache_pool = (Slot *)xr_malloc(dm_cache_size * sizeof(Slot));
115-
115+
116116
for (u32 i = 0; i < dm_cache_size; ++i)
117117
new(&cache_pool[i]) Slot();
118118
/*
119119
CacheSlot1 cache_level1[dm_cache1_line][dm_cache1_line];
120120
Slot* cache [dm_cache_line][dm_cache_line]; // grid-cache itself
121-
Slot cache_pool [dm_cache_size]; // just memory for slots
121+
Slot cache_pool [dm_cache_size]; // just memory for slots
122122
*/
123123
}
124124

src/Layers/xrRender/R_Backend.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ class ECORE_API CBackend
7878
#if defined(USE_DX11)
7979
ref_cbuffer m_aVertexConstants[MaxCBuffers];
8080
ref_cbuffer m_aPixelConstants[MaxCBuffers];
81-
81+
8282
ref_cbuffer m_aGeometryConstants[MaxCBuffers];
8383
ref_cbuffer m_aComputeConstants[MaxCBuffers];
8484

@@ -87,9 +87,9 @@ class ECORE_API CBackend
8787

8888
D3D_PRIMITIVE_TOPOLOGY m_PrimitiveTopology;
8989
ID3DInputLayout* m_pInputLayout;
90-
u32 dummy0; // Padding to avoid warning
91-
u32 dummy1; // Padding to avoid warning
92-
u32 dummy2; // Padding to avoid warning
90+
u32 dummy0; // Padding to avoid warning
91+
u32 dummy1; // Padding to avoid warning
92+
u32 dummy2; // Padding to avoid warning
9393
#endif
9494
private:
9595
// Render-targets

src/Layers/xrRender/R_Backend_Runtime.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ void CBackend::set_ClipPlanes(u32 _enable, Fplane* _planes /*=NULL */, u32 count
171171

172172
// Enable them
173173
u32 e_mask = (1 << count) - 1;
174-
CHK_DX(HW.pDevice->SetRenderState(D3DRS_CLIPPLANEENABLE, e_mask));
174+
CHK_DX(HW.pDevice->SetRenderState(D3DRS_CLIPPLANEENABLE, e_mask));
175175
#elif defined(USE_DX11) || defined(USE_OGL)
176176
// TODO: DX11: Implement in the corresponding vertex shaders
177177
// Use this to set up location, were shader setup code will get data

src/Layers/xrRender/ResourceManager.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ IBlender* CResourceManager::_GetBlender(LPCSTR Name)
4040
Msg("! Shader '%s' not found in library.", Name);
4141
return nullptr;
4242
}
43-
43+
4444
return I->second;
4545
}
4646

src/Layers/xrRender/ResourceManager_Resources.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ void simplify_texture(string_path& fn)
2929

3030
SState* CResourceManager::_CreateState(SimulatorStates& state_code)
3131
{
32-
// Search equal state-code
32+
// Search equal state-code
3333
for (SState* C : v_states)
3434
{
3535
SimulatorStates& base = C->state_code;

src/Layers/xrRender/SH_Atomic.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ SPS::~SPS()
7070
#else
7171
# error No graphics API selected or enabled!
7272
#endif
73-
73+
7474
RImplementation.Resources->_DeletePS(this);
7575
}
7676

src/Layers/xrRender/SH_Constant.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class ECORE_API CConstant : public xr_resource_named
1616
modeWaveForm
1717
};
1818

19-
public:
19+
public:
2020
Fcolor const_float{ 0.0f, 0.0f, 0.0f, 0.0f };
2121
u32 const_dword{ 0 };
2222

src/Layers/xrRender/SH_Matrix.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class ECORE_API CMatrix : public xr_resource_named
2626
tcmFORCE32 = u32(-1)
2727
};
2828

29-
public:
29+
public:
3030
Fmatrix xform{};
3131

3232
u32 dwFrame{ 0 };

src/Layers/xrRender/ShaderResourceTraits.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ inline std::pair<char, GLuint> GLCompileShader(pcstr* buffer, size_t size, pcstr
6161

6262
const GLuint program = glCreateProgram();
6363
R_ASSERT(program);
64-
if (GLEW_VERSION_4_3)
64+
if (GLEW_VERSION_4_3)
6565
CHK_GL(glObjectLabel(GL_PROGRAM, program, -1, name));
6666
CHK_GL(glProgramParameteri(program, GL_PROGRAM_SEPARABLE, (GLint)GL_TRUE));
6767
if (HW.ShaderBinarySupported)

src/Layers/xrRender/SkeletonXSkinXW_CPP.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ void Skin3W(vertRender* D, vertBoned3W* S, u32 vCount, CBoneInstance* Bones)
184184

185185
void Skin4W(vertRender* D, vertBoned4W* S, u32 vCount, CBoneInstance* Bones)
186186
{
187-
xr_parallel_for(TaskRange<u32>(0, vCount), [&](const TaskRange<u32>& range)
187+
xr_parallel_for(TaskRange<u32>(0, vCount), [&](const TaskRange<u32>& range)
188188
{
189189
Fvector P0, N0, P1, N1, P2, N2, P3, N3;
190190
for (u32 i = range.begin(); i != range.end(); ++i)

0 commit comments

Comments
 (0)