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

#3 remap jump key from ALT to D (for Firefox and IE support)

Browse Source
This commit is contained in:
XProger
2017-07-16 05:27:03 +03:00
parent d57056e8a0
commit 8e60fe17a2
3 changed files with 137 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/input.h
View File

@@ -33,7 +33,7 @@ namespace Input {
{ ikRight, ikJoyRight }, { ikRight, ikJoyRight },
{ ikUp, ikJoyUp }, { ikUp, ikJoyUp },
{ ikDown, ikJoyDown }, { ikDown, ikJoyDown },
{ ikAlt, ikJoyX }, { ikD, ikJoyX },
{ ikShift, ikJoyRB }, { ikShift, ikJoyRB },
{ ikCtrl, ikJoyA }, { ikCtrl, ikJoyA },
{ ikSpace, ikJoyY }, { ikSpace, ikJoyY },

270
src/shaders/water.glsl
View File

@@ -1,7 +1,7 @@
R"====( R"====(
#ifdef GL_ES #ifdef GL_ES
precision lowp int; precision lowp int;
precision highp float; precision highp float;
#endif #endif
varying vec3 vCoord; varying vec3 vCoord;
@@ -23,181 +23,181 @@ uniform vec4 uParam;
uniform sampler2D sNormal; uniform sampler2D sNormal;
#ifdef VERTEX #ifdef VERTEX
#define ETA_AIR 1.000 #define ETA_AIR 1.000
#define ETA_WATER 1.333 #define ETA_WATER 1.333
attribute vec4 aCoord; attribute vec4 aCoord;
void main() { void main() {
vTexCoord = (aCoord.xy * 0.5 + 0.5) * uTexParam.zw; vTexCoord = (aCoord.xy * 0.5 + 0.5) * uTexParam.zw;
#if defined(WATER_MASK) || defined(WATER_COMPOSE) #if defined(WATER_MASK) || defined(WATER_COMPOSE)
float height = 0.0; float height = 0.0;
#ifdef WATER_COMPOSE #ifdef WATER_COMPOSE
#ifdef WATER_USE_GRID #ifdef WATER_USE_GRID
vTexCoord = (aCoord.xy * (1.0 / 48.0) * 0.5 + 0.5) * uTexParam.zw; vTexCoord = (aCoord.xy * (1.0 / 48.0) * 0.5 + 0.5) * uTexParam.zw;
height = texture2D(sNormal, vTexCoord).x; height = texture2D(sNormal, vTexCoord).x;
#endif #endif
#endif #endif
vCoord = vec3(aCoord.x, height, aCoord.y) * uPosScale[1] + uPosScale[0]; vCoord = vec3(aCoord.x, height, aCoord.y) * uPosScale[1] + uPosScale[0];
vec4 cp = uViewProj * vec4(vCoord, 1.0); vec4 cp = uViewProj * vec4(vCoord, 1.0);
vProjCoord = cp; vProjCoord = cp;
gl_Position = cp; gl_Position = cp;
#else #else
vProjCoord = vec4(0.0); vProjCoord = vec4(0.0);
vCoord = vec3(aCoord.xy, 0.0); vCoord = vec3(aCoord.xy, 0.0);
#ifdef WATER_CAUSTICS #ifdef WATER_CAUSTICS
vec3 rCoord = vec3(aCoord.x, aCoord.y, 0.0) * uPosScale[1].xzy; vec3 rCoord = vec3(aCoord.x, aCoord.y, 0.0) * uPosScale[1].xzy;
vec4 info = texture2D(sNormal, (rCoord.xy * 0.5 + 0.5) * uTexParam.zw); vec4 info = texture2D(sNormal, (rCoord.xy * 0.5 + 0.5) * uTexParam.zw);
vec3 normal = vec3(info.z, info.w, sqrt(1.0 - dot(info.zw, info.zw))); vec3 normal = vec3(info.z, info.w, sqrt(1.0 - dot(info.zw, info.zw)));
vec3 light = vec3(0.0, 0.0, 1.0); vec3 light = vec3(0.0, 0.0, 1.0);
vec3 refOld = refract(-light, vec3(0.0, 0.0, 1.0), 0.75); vec3 refOld = refract(-light, vec3(0.0, 0.0, 1.0), 0.75);
vec3 refNew = refract(-light, normal, 0.75); vec3 refNew = refract(-light, normal, 0.75);
vOldPos = vec4(rCoord + refOld * (-1.0 / refOld.z) + refOld * ((-refOld.z - 1.0) / refOld.z), 1.0); vOldPos = vec4(rCoord + refOld * (-1.0 / refOld.z) + refOld * ((-refOld.z - 1.0) / refOld.z), 1.0);
vNewPos = vec4(rCoord + refNew * ((info.r - 1.0) / refNew.z) + refOld * ((-refNew.z - 1.0) / refOld.z), 1.0); vNewPos = vec4(rCoord + refNew * ((info.r - 1.0) / refNew.z) + refOld * ((-refNew.z - 1.0) / refOld.z), 1.0);
gl_Position = vec4(vNewPos.xy + refOld.xy / refOld.z, 0.0, 1.0); gl_Position = vec4(vNewPos.xy + refOld.xy / refOld.z, 0.0, 1.0);
#else #else
vOldPos = vNewPos = vec4(0.0); vOldPos = vNewPos = vec4(0.0);
gl_Position = vec4(aCoord.xyz, 1.0); gl_Position = vec4(aCoord.xyz, 1.0);
#endif #endif
#endif #endif
vViewVec = uViewPos - vCoord.xyz; vViewVec = uViewPos - vCoord.xyz;
vLightVec = uLightPos - vCoord.xyz; vLightVec = uLightPos - vCoord.xyz;
} }
#else #else
uniform sampler2D sDiffuse; uniform sampler2D sDiffuse;
uniform sampler2D sReflect; uniform sampler2D sReflect;
uniform sampler2D sMask; uniform sampler2D sMask;
uniform vec4 uLightColor; uniform vec4 uLightColor;
#define PI 3.141592653589793 #define PI 3.141592653589793
float calcFresnel(float NdotL, float fbias, float fpow) { float calcFresnel(float NdotL, float fbias, float fpow) {
float f = 1.0 - abs(NdotL); float f = 1.0 - abs(NdotL);
return clamp(fbias + (1.0 - fbias) * pow(f, fpow), 0.0, 1.0); return clamp(fbias + (1.0 - fbias) * pow(f, fpow), 0.0, 1.0);
} }
vec3 applyFog(vec3 color, vec3 fogColor, float factor) { vec3 applyFog(vec3 color, vec3 fogColor, float factor) {
float fog = clamp(1.0 / exp(factor), 0.0, 1.0); float fog = clamp(1.0 / exp(factor), 0.0, 1.0);
return mix(fogColor, color, fog); return mix(fogColor, color, fog);
} }
vec4 drop() { vec4 drop() {
vec2 tc = gl_FragCoord.xy * uTexParam.xy; vec2 tc = gl_FragCoord.xy * uTexParam.xy;
vec4 v = texture2D(sDiffuse, tc); vec4 v = texture2D(sDiffuse, tc);
float drop = max(0.0, 1.0 - length(uParam.xy - gl_FragCoord.xy) / uParam.z); float drop = max(0.0, 1.0 - length(uParam.xy - gl_FragCoord.xy) / uParam.z);
drop = 0.5 - cos(drop * PI) * 0.5; drop = 0.5 - cos(drop * PI) * 0.5;
v.x += drop * uParam.w; v.x += drop * uParam.w;
return v; return v;
} }
vec4 calc() { vec4 calc() {
vec2 tc = gl_FragCoord.xy * uTexParam.xy; vec2 tc = gl_FragCoord.xy * uTexParam.xy;
if (texture2D(sMask, tc).x < 0.5) if (texture2D(sMask, tc).x < 0.5)
return vec4(0.0); return vec4(0.0);
vec4 v = texture2D(sDiffuse, tc); // height, speed, normal.xz vec4 v = texture2D(sDiffuse, tc); // height, speed, normal.xz
vec3 d = vec3(uTexParam.xy, 0.0); vec3 d = vec3(uTexParam.xy, 0.0);
vec4 f = vec4(texture2D(sDiffuse, tc + d.xz).x, texture2D(sDiffuse, tc + d.zy).x, vec4 f = vec4(texture2D(sDiffuse, tc + d.xz).x, texture2D(sDiffuse, tc + d.zy).x,
texture2D(sDiffuse, tc - d.xz).x, texture2D(sDiffuse, tc - d.zy).x); texture2D(sDiffuse, tc - d.xz).x, texture2D(sDiffuse, tc - d.zy).x);
float average = dot(f, vec4(0.25)); float average = dot(f, vec4(0.25));
// normal // normal
v.zw = normalize( vec3(f.x - f.z, 64.0 / (1024.0 * 2.0), f.y - f.w) ).xz; v.zw = normalize( vec3(f.x - f.z, 64.0 / (1024.0 * 2.0), f.y - f.w) ).xz;
// integrate // integrate
const float vel = 1.4; const float vel = 1.4;
const float vis = 0.995; const float vis = 0.995;
v.y += (average - v.x) * vel; v.y += (average - v.x) * vel;
v.y *= vis; v.y *= vis;
v.x += v.y; v.x += v.y;
return v; return v;
} }
vec4 caustics() { vec4 caustics() {
float rOldArea = length(dFdx(vOldPos.xyz)) * length(dFdy(vOldPos.xyz)); float rOldArea = length(dFdx(vOldPos.xyz)) * length(dFdy(vOldPos.xyz));
float rNewArea = length(dFdx(vNewPos.xyz)) * length(dFdy(vNewPos.xyz)); float rNewArea = length(dFdx(vNewPos.xyz)) * length(dFdy(vNewPos.xyz));
float value = clamp(rOldArea / rNewArea * 0.2, 0.0, 1.0) * vOldPos.w; float value = clamp(rOldArea / rNewArea * 0.2, 0.0, 1.0) * vOldPos.w;
return vec4(0.0, value, 0.0, 0.0); return vec4(0.0, value, 0.0, 0.0);
} }
vec4 mask() { vec4 mask() {
return vec4(0.0); return vec4(0.0);
} }
vec4 compose() { vec4 compose() {
vec4 value = texture2D(sNormal, vTexCoord); vec4 value = texture2D(sNormal, vTexCoord);
vec3 normal = vec3(value.z, -sqrt(1.0 - dot(value.zw, value.zw)), value.w); vec3 normal = vec3(value.z, -sqrt(1.0 - dot(value.zw, value.zw)), value.w);
vec2 dudv = (uViewProj * vec4(normal.x, 0.0, normal.z, 0.0)).xy; vec2 dudv = (uViewProj * vec4(normal.x, 0.0, normal.z, 0.0)).xy;
vec3 viewVec = normalize(vViewVec); vec3 viewVec = normalize(vViewVec);
vec3 rv = reflect(-viewVec, normal); vec3 rv = reflect(-viewVec, normal);
vec3 lv = normalize(vLightVec); vec3 lv = normalize(vLightVec);
float spec = pow(max(0.0, dot(rv, lv)), 64.0) * 0.5; float spec = pow(max(0.0, dot(rv, lv)), 64.0) * 0.5;
vec2 tc = vProjCoord.xy / vProjCoord.w * 0.5 + 0.5;
vec4 refrA = texture2D(sDiffuse, uParam.xy * clamp(tc + dudv * uParam.z, 0.0, 0.999) ); vec2 tc = vProjCoord.xy / vProjCoord.w * 0.5 + 0.5;
vec4 refrB = texture2D(sDiffuse, uParam.xy * tc );
vec4 refr = vec4(mix(refrA.xyz, refrB.xyz, refrA.w), 1.0);
vec4 refl = texture2D(sReflect, vec2(tc.x, 1.0 - tc.y) + dudv * uParam.w);
float fresnel = calcFresnel(dot(normal, viewVec), 0.1, 2.0); vec4 refrA = texture2D(sDiffuse, uParam.xy * clamp(tc + dudv * uParam.z, 0.0, 0.999) );
vec4 refrB = texture2D(sDiffuse, uParam.xy * tc );
vec4 refr = vec4(mix(refrA.xyz, refrB.xyz, refrA.w), 1.0);
vec4 refl = texture2D(sReflect, vec2(tc.x, 1.0 - tc.y) + dudv * uParam.w);
vec4 color = mix(refr, refl, fresnel) + spec * 1.5; float fresnel = calcFresnel(dot(normal, viewVec), 0.1, 2.0);
float d = abs((vCoord.y - uViewPos.y) / normalize(vViewVec).y); vec4 color = mix(refr, refl, fresnel) + spec * 1.5;
d *= step(0.0, uViewPos.y - vCoord.y); // apply fog only when camera is underwater
color.xyz = applyFog(color.xyz, UNDERWATER_COLOR * 0.2, d * WATER_FOG_DIST);
return color; float d = abs((vCoord.y - uViewPos.y) / normalize(vViewVec).y);
} d *= step(0.0, uViewPos.y - vCoord.y); // apply fog only when camera is underwater
color.xyz = applyFog(color.xyz, UNDERWATER_COLOR * 0.2, d * WATER_FOG_DIST);
vec4 pass() {
#ifdef WATER_DROP
return drop();
#endif
#ifdef WATER_STEP return color;
return calc(); }
#endif
#ifdef WATER_CAUSTICS vec4 pass() {
return caustics(); #ifdef WATER_DROP
#endif return drop();
#endif
#ifdef WATER_MASK #ifdef WATER_STEP
return mask(); return calc();
#endif #endif
#ifdef WATER_COMPOSE #ifdef WATER_CAUSTICS
return compose(); return caustics();
#endif #endif
return vec4(1.0, 0.0, 1.0, 1.0); #ifdef WATER_MASK
} return mask();
#endif
void main() {
gl_FragColor = pass(); #ifdef WATER_COMPOSE
} return compose();
#endif
return vec4(1.0, 0.0, 1.0, 1.0);
}
void main() {
gl_FragColor = pass();
}
#endif #endif
)====" )===="

2
src/ui.h
View File

@@ -205,7 +205,7 @@ namespace UI {
" SHIFT - Walk@" " SHIFT - Walk@"
" SPACE - Draw Weapon@" " SPACE - Draw Weapon@"
" CTRL - Action@" " CTRL - Action@"
" ALT - Jump@" " D - Jump@"
" Z - Step Left@" " Z - Step Left@"
" X - Step Right@" " X - Step Right@"
" A - Roll@" " A - Roll@"