lpnf
/
lovr
mirror of https://github.com/bjornbytes/lovr.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into dev

This commit is contained in:
bjorn 2021-03-28 10:09:58 -06:00
parent 2b1b777e84 e346c3f807
commit 0daaca7a4f
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/resources/AndroidManifest_oculus.xml
View File

@ -4,7 +4,7 @@
<uses-feature android:glEsVersion="0x00030001" android:required="true"/>
<uses-feature android:name="android.hardware.vr.headtracking" android:required="false"/>
<uses-feature android:name="oculus.software.handtracking" android:required="false"/>
<uses-permission android:name="oculus.permission.HAND_TRACKING"/>
<uses-permission android:name="com.oculus.permission.HAND_TRACKING"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-permission android:name="android.permission.INTERNET" />

14
src/resources/shaders.c
View File

@ -187,10 +187,10 @@ const char* lovrStandardVertexShader = ""
const char* lovrStandardFragmentShader = ""
"#define PI 3.14159265358979 \n"
"#ifdef GL_ES \n"
"#define EPS 1e-2 \n"
"#if defined(GL_ES) && !defined(FLAG_highp) \n"
"#define EPS 1e-4 \n"
"#else \n"
"#define EPS 1e-5 \n"
"#define EPS 1e-8 \n"
"#endif \n"
"in vec3 vVertexPositionWorld; \n"
@ -274,7 +274,7 @@ const char* lovrStandardFragmentShader = ""
" float alpha = roughness * roughness; \n"
" float alpha2 = alpha * alpha; \n"
" float denom = (NoH * NoH) * (alpha2 - 1.) + 1.; \n"
" return alpha2 / (PI * denom * denom); \n"
" return alpha2 / max(PI * denom * denom, EPS); \n"
"} \n"
"float G_SmithGGXCorrelated(float NoV, float NoL, float roughness) { \n"
@ -290,7 +290,7 @@ const char* lovrStandardFragmentShader = ""
"} \n"
"vec3 E_SphericalHarmonics(vec3 sh[9], vec3 n) { \n"
" n = -n; // WHY \n"
" n = -n; \n"
" return max("
"sh[0] + "
"sh[1] * n.y + "
@ -313,13 +313,13 @@ const char* lovrStandardFragmentShader = ""
" return vec2(-1.04, 1.04) * a004 + r.zw; \n"
"} \n"
"vec3 tonemap_ACES(vec3 color) { \n"
"vec3 tonemap_ACES(vec3 x) { \n"
" float a = 2.51; \n"
" float b = 0.03; \n"
" float c = 2.43; \n"
" float d = 0.59; \n"
" float e = 0.14; \n"
" return (color * (a * color + b)) / (color * (c * color + d) + e); \n"
" return (x * (a * x + b)) / (x * (c * x + d) + e); \n"
"}";
const char* lovrCubeVertexShader = ""