mirror/openlara
1
0
Fork 0
mirror of https://github.com/XProger/OpenLara.git synced 2025-08-06 05:07:48 +02:00
Code Issues Releases Wiki Activity

remove tabs

Browse Source
This commit is contained in:
XProger
2020-03-14 14:09:20 +03:00
parent 59abd003a1
commit 7e8124778d
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/debug.h
View File

@@ -206,8 +206,8 @@ namespace Debug {
vec4 p = Core::mViewProj * vec4(pos, 1); vec4 p = Core::mViewProj * vec4(pos, 1);
if (p.w > 0) { if (p.w > 0) {
p.xyz() = p.xyz() * (1.0f / p.w); p.xyz() = p.xyz() * (1.0f / p.w);
p.y = -p.y; p.y = -p.y;
p.xyz() = (p.xyz() * 0.5f + vec3(0.5f)) * vec3(float(Core::width), float(Core::height), 1.0f); 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); text(vec2(p.x, p.y), color, str);
} }
} }

2
src/gapi/c3d.h
View File

@@ -137,7 +137,7 @@ namespace GAPI {
bool rebind; bool rebind;
void init(Pass pass, int type, int *def, int defCount) { void init(Pass pass, int type, int *def, int defCount) {
shaderProgramInit(&program); shaderProgramInit(&program);
DVLB_s* src = NULL; DVLB_s* src = NULL;

8
src/gapi/gxm.h
View File

@@ -507,7 +507,7 @@ namespace GAPI {
case passShadow : case passShadow :
switch (type) { switch (type) {
case 3 : 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); default : ASSERT(false);
} }
break; break;
@@ -540,12 +540,12 @@ namespace GAPI {
} }
break; break;
case passGUI : vSrc = SHADER ( gui, v ); fSrc = SHADER ( gui, f ); 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; case PASS_CLEAR : vSrc = SHADER ( clear, v ); fSrc = SHADER ( clear, f ); break;
default : ASSERT(false); LOG("! wrong pass id\n"); return; 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_A
#undef SHADER_U #undef SHADER_U
@@ -603,7 +603,7 @@ namespace GAPI {
colorMask = blendMode = -1; colorMask = blendMode = -1;
LOG("done\n"); LOG("done\n");
} }
void deinit() { void deinit() {

4
src/napi_socket.h
View File

@@ -59,8 +59,8 @@ namespace NAPI {
void init() { void init() {
sock = INVALID_SOCKET; sock = INVALID_SOCKET;
WSAData wData; WSAData wData;
WSAStartup(0x0101, &wData); WSAStartup(0x0101, &wData);
} }
void deinit() { void deinit() {

6
src/utils.h
View File

@@ -1063,15 +1063,15 @@ struct Basis {
w = 1.0f; w = 1.0f;
} }
Basis operator * (const Basis &basis) const { Basis operator * (const Basis &basis) const {
return Basis(rot * basis.rot, pos + rot * basis.pos); 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; return rot * v + pos;
} }
Basis inverse() const { Basis inverse() const {
quat q = rot.conjugate(); quat q = rot.conjugate();
return Basis(q, -(q * pos)); return Basis(q, -(q * pos));
} }