From 7e8124778daa434786c24b7f931f2d6a2238d077 Mon Sep 17 00:00:00 2001 From: XProger Date: Sat, 14 Mar 2020 14:09:20 +0300 Subject: [PATCH] remove tabs --- src/debug.h | 4 ++-- src/gapi/c3d.h | 2 +- src/gapi/gxm.h | 8 ++++---- src/napi_socket.h | 4 ++-- src/utils.h | 6 +++--- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/debug.h b/src/debug.h index 030c125..9bec144 100644 --- a/src/debug.h +++ b/src/debug.h @@ -206,8 +206,8 @@ namespace Debug { vec4 p = Core::mViewProj * vec4(pos, 1); if (p.w > 0) { p.xyz() = p.xyz() * (1.0f / p.w); - p.y = -p.y; - p.xyz() = (p.xyz() * 0.5f + vec3(0.5f)) * vec3(float(Core::width), float(Core::height), 1.0f); + p.y = -p.y; + p.xyz() = (p.xyz() * 0.5f + vec3(0.5f)) * vec3(float(Core::width), float(Core::height), 1.0f); text(vec2(p.x, p.y), color, str); } } diff --git a/src/gapi/c3d.h b/src/gapi/c3d.h index 7a14460..809ec1b 100644 --- a/src/gapi/c3d.h +++ b/src/gapi/c3d.h @@ -137,7 +137,7 @@ namespace GAPI { bool rebind; void init(Pass pass, int type, int *def, int defCount) { - shaderProgramInit(&program); + shaderProgramInit(&program); DVLB_s* src = NULL; diff --git a/src/gapi/gxm.h b/src/gapi/gxm.h index 474e579..f7e1dd0 100644 --- a/src/gapi/gxm.h +++ b/src/gapi/gxm.h @@ -507,7 +507,7 @@ namespace GAPI { case passShadow : switch (type) { case 3 : - case 4 : vSrc = SHADER ( shadow_entity, v ); fSrc = SHADER ( shadow_entity, f ); break; + case 4 : vSrc = SHADER ( shadow_entity, v ); fSrc = SHADER ( shadow_entity, f ); break; default : ASSERT(false); } break; @@ -540,12 +540,12 @@ namespace GAPI { } break; case passGUI : vSrc = SHADER ( gui, v ); fSrc = SHADER ( gui, f ); break; - case passSky : vSrc = SHADER ( gui, v ); fSrc = SHADER ( gui, f ); break; + case passSky : vSrc = SHADER ( gui, v ); fSrc = SHADER ( gui, f ); break; case PASS_CLEAR : vSrc = SHADER ( clear, v ); fSrc = SHADER ( clear, f ); break; default : ASSERT(false); LOG("! wrong pass id\n"); return; } - LOG(" %s", vSrc != NULL ? "true" : "false"); + LOG(" %s", vSrc != NULL ? "true" : "false"); #undef SHADER_A #undef SHADER_U @@ -603,7 +603,7 @@ namespace GAPI { colorMask = blendMode = -1; - LOG("done\n"); + LOG("done\n"); } void deinit() { diff --git a/src/napi_socket.h b/src/napi_socket.h index bc86e5a..7a3d8f5 100644 --- a/src/napi_socket.h +++ b/src/napi_socket.h @@ -59,8 +59,8 @@ namespace NAPI { void init() { sock = INVALID_SOCKET; - WSAData wData; - WSAStartup(0x0101, &wData); + WSAData wData; + WSAStartup(0x0101, &wData); } void deinit() { diff --git a/src/utils.h b/src/utils.h index c53674a..d5f1178 100644 --- a/src/utils.h +++ b/src/utils.h @@ -1063,15 +1063,15 @@ struct Basis { w = 1.0f; } - Basis operator * (const Basis &basis) const { + Basis operator * (const Basis &basis) const { return Basis(rot * basis.rot, pos + rot * basis.pos); } - vec3 operator * (const vec3 &v) const { + vec3 operator * (const vec3 &v) const { return rot * v + pos; } - Basis inverse() const { + Basis inverse() const { quat q = rot.conjugate(); return Basis(q, -(q * pos)); }