Skip to content

Commit 56e4f5e

Browse files
committed
Shuffle things around again and update tidy format.
1 parent 2dde334 commit 56e4f5e

28 files changed

+23
-19
lines changed

.clang-format

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ AlignConsecutiveDeclarations: true
88
AlignEscapedNewlines: Left
99
AlignTrailingComments: true
1010
AlignOperands: true
11+
AlignArrayOfStructures: Left
1112
AllowAllArgumentsOnNextLine: false
1213
AllowAllConstructorInitializersOnNextLine: false
1314
AllowAllParametersOfDeclarationOnNextLine: false

engine/CMakeLists.txt

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -85,19 +85,19 @@ add_executable(chronon-engine WIN32
8585

8686
# Renderer
8787
# -- gl
88-
client/renderer/ref_gl/gl_draw.cpp
89-
client/renderer/ref_gl/gl_image.cpp
90-
client/renderer/ref_gl/gl_model.cpp
91-
client/renderer/ref_gl/gl_rmain.cpp
92-
client/renderer/ref_gl/gl_rmisc.cpp
93-
client/renderer/ref_gl/gl_rsurf.cpp
94-
client/renderer/ref_gl/gl_shader_manager.cpp
95-
client/renderer/ref_gl/gl_warp.cpp
96-
client/renderer/ref_gl/qgl.cpp
88+
renderer/ref_gl/gl_draw.cpp
89+
renderer/ref_gl/gl_image.cpp
90+
renderer/ref_gl/gl_model.cpp
91+
renderer/ref_gl/gl_rmain.cpp
92+
renderer/ref_gl/gl_rmisc.cpp
93+
renderer/ref_gl/gl_rsurf.cpp
94+
renderer/ref_gl/gl_shader_manager.cpp
95+
renderer/ref_gl/gl_warp.cpp
96+
renderer/ref_gl/qgl.cpp
9797
# -- generic
98-
client/renderer/light.cpp
99-
client/renderer/material.cpp
100-
client/renderer/shader_manager.cpp
98+
renderer/light.cpp
99+
renderer/material.cpp
100+
renderer/shader_manager.cpp
101101

102102
# Server
103103
server/sv_ccmds.cpp

engine/client/vid_menu.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
1919
*/
2020
#include "../client/client.h"
2121
#include "../client/qmenu.h"
22-
#include "../client/renderer/ref_gl/gl_local.h"
22+
23+
#include "../renderer/ref_gl/gl_local.h"
2324

2425
#define REF_OPENGL 1
2526

File renamed without changes.

engine/client/renderer/material.cpp renamed to engine/renderer/material.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
1818
1919
*/
2020

21-
#include "../client.h"
21+
#include "../client/client.h"
22+
2223
#include "material.h"
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)