1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-21 07:23:54 +00:00
Commit graph

273 commits

Author SHA1 Message Date
psi29a
d8d7a3b372 Merge branch 'softparticles_patch' into 'master'
Shadervisitor adjustments and Mac OS fix for soft particles

See merge request OpenMW/openmw!1380
2022-01-06 13:13:52 +00:00
glassmancody.info
d5cba38f4b shader-based object texture blending 2021-12-30 17:08:43 -08:00
Bret Curtis
9336626927 use OPENMW_RESOURCES_ROOT instead 2021-12-08 14:33:49 +01:00
Bret Curtis
a9bf53d4ed modified builtin_scripts to be macOS aware; simplified things as the SHADER and MYGUI dir were just pointing to the OpenMW_BINARY_DIR anyway, so removing the code duplication 2021-12-08 14:28:56 +01:00
glassmancody.info
9389cfaa42 mac os driver workaround and shadervisitor fixes 2021-11-20 18:39:20 -08:00
psi29a
68e7a4083e Merge branch 'master' into 'master'
Overhaul raindrop water ripple effect

Closes #6360

See merge request OpenMW/openmw!1316
2021-11-13 21:44:25 +00:00
psi29a
bea8df7dd4 Merge branch 'astoecke-fix-6386-water-reflection' into 'master'
Use `gl_FragCoord`  in `water_fragment.glsl` (fixes #6386)

Closes #6386

See merge request OpenMW/openmw!1347
2021-11-12 22:05:05 +00:00
wareya
a1d03d178d Update water_fragment.glsl 2021-11-12 06:55:19 +00:00
Alexei Dobrohotov
9880c43c86 Add specular strength shader parameter 2021-11-10 19:58:06 +03:00
Andreas Stöckel
fbc7cf5e65 Fix #6386
Use `gl_FragCoords` instead passing the normalised screen-space coordinates
to the fragment shader in a numerically unstable way.
2021-11-09 23:25:06 -05:00
psi29a
5836d0225f Merge branch 'leave_butter_to_soften' into 'master'
Soft Particles (#6128)

See merge request OpenMW/openmw!980
2021-11-09 14:16:47 +00:00
Alexei Dobrohotov
9dd36a345f Fix a typo in nv_default shader 2021-11-07 16:02:27 +03:00
wareya
6d98866be0 Merge remote-tracking branch 'upstream/master' 2021-11-06 11:44:12 -04:00
wareya
9b030e174f removing this part was a mistake, made the ripples more repetitive 2021-10-31 15:52:54 -04:00
wareya
e1378cd290 Replace uniform with define 2021-10-31 13:18:19 -04:00
wareya
226d3eac0d Improve performance, add simpler ripples, add a setting, fix nighttime brightness 2021-10-31 10:33:28 -04:00
glassmancody.info
40b6bbbdf3 use openmw define system 2021-10-30 12:19:31 -07:00
glassmancody.info
8c3b00164e soft particles 2021-10-30 12:19:31 -07:00
glassmancody.info
07e32c0fa6 remove object shader path 2021-10-25 10:23:16 -07:00
glassmancody.info
9cbbd2fff5 better transitions 2021-10-24 17:13:42 -07:00
glassmancody.info
1e40d27318 introduce sky shaders 2021-10-23 17:53:38 -07:00
wareya
1848f7f915 Overhaul raindrop water ripple effect 2021-10-22 21:33:32 -04:00
Bret Curtis
e581b61ecb check if FORCE_OPAQUE is available before using it. 2021-10-06 08:05:10 +02:00
Bo Svensson
4b1c009ffd
use StateSet define for translucentFramebuffer (#3138)
With this PR we test out osg's shader define system for a somewhat harmless feature. As we can see, our code becomes more concise and efficient in this case. Most importantly, we no longer create unneeded vertex shader objects.
2021-10-05 14:37:08 +02:00
glassmancody.info
81267e7be7 add missing centroid to debug vertex shaders 2021-08-07 18:04:11 -07:00
glassmancody.info
09e03fde2e refactor and fix wobbly shores 2021-08-04 17:49:57 -07:00
glassmancody.info
cad0b151cb enable shaders path and dehardcode depth formats 2021-08-04 17:39:11 -07:00
glassmancody.info
70fac33940 initial reverse-z depth implementation 2021-08-04 17:39:11 -07:00
Alexei Dobrohotov
9834fd51af Address shader issues pointed out by AnyOldName3 2021-07-29 22:28:05 +03:00
Alexei Dobrohotov
11694ba87f Correct dark map and detail map alpha handling
Comment texenv usage in NIF loader
2021-07-29 04:48:59 +03:00
psi29a
6949dd89c2 Merge branch 'gui_shaders' into 'master'
Add shader path for mygui (#6162)

See merge request OpenMW/openmw!1019
2021-07-25 21:37:39 +00:00
psi29a
a7881b9196 Merge branch 'wobblywater' into 'master'
Wobbly Water: make shorelines wavy when refraction is enabled

See merge request OpenMW/openmw!673
2021-07-25 21:35:52 +00:00
glassmancody.info
e8c6f31e0c add shader path for mygui (#6162) 2021-07-22 15:55:30 -07:00
AnyOldName3
84a9facedf Disable coverage adjustment for blended objects 2021-07-04 23:29:22 +01:00
Dobrohotov Alexei
ad5ee1aa1c Don't flip NV PPL shader Y axis erroneously 2021-05-03 01:34:54 +03:00
glassmancody.info
c48eee4eee Clamp vertex lighting before interpolation
Fixes a regression in which pass lighting was clamped after being passed
to fragment shader. For correct FFP emulation, we need to clamp the result
in vertex shader. When clamping after interpolation, negative lights in
particular have a much more drastic effect.
2021-04-22 16:53:37 -07:00
AnyOldName3
ce3ed28403 Control stomping via settings. 2021-04-18 21:44:23 +01:00
AnyOldName3
87ce1a7351 Explain stomp constants 2021-04-18 20:31:33 +01:00
AnyOldName3
a81dfe9ccc MGE XE-like stomping 2021-04-18 20:31:33 +01:00
AnyOldName3
1737f737df Don't use a vec3 if only two components get read 2021-04-18 20:31:32 +01:00
glassmancody.info
531a6e1979 Code review fixes, remove implicit GLSL casts 2021-04-13 11:09:54 -07:00
glassmancody.info
92033bca64 Fixed error in calculating viewspace sun dir, minor cleanup 2021-04-13 11:09:49 -07:00
glassmancody.info
9e80091aff clear up force shaders and make it less convoluted 2021-04-13 11:09:49 -07:00
glassmancody.info
d4e7d25d14 Make life not suck for whoever wants to edit lighting shaders 2021-04-13 11:09:49 -07:00
glassmancody.info
eecb9886a9 Shader cleanup, fix indicies 2021-04-13 11:09:49 -07:00
glassmancody.info
4ba473b684 Finalize settings, torch fix 2021-04-13 11:09:49 -07:00
glassmancody.info
71c30a31df in-game settings, some require restart 2021-04-13 11:09:49 -07:00
glassmancody.info
280fd2b162 Merge remote-tracking branch 'upstream/master' into why_are_the_christmas_lights_still_up 2021-04-13 11:09:35 -07:00
glassmancody.info
71f7f30c0b Don't break NV shaders 2021-04-13 11:09:35 -07:00
glassmancody.info
d195602a9d Switch to shared layout, some rewording 2021-04-13 11:09:35 -07:00
glassmancody.info
690995988b More formatting, OpenCS cells are unbroken 2021-04-13 11:09:35 -07:00
glassmancody.info
08b5681284 Missed redundant formatting changes 2021-04-13 11:09:35 -07:00
glassmancody.info
328ec85757 Code review cleanup, add setting documentation 2021-04-13 11:09:35 -07:00
glassmancody.info
24454a1698 Switch to integer, uint not reliable in GLSL 120 2021-04-13 11:09:35 -07:00
glassmancody.info
ec27e60284 Cutoff conditional in light shader 2021-04-13 11:09:35 -07:00
glassmancody.info
05a5cee132 Brighter point lights and light fade 2021-04-13 11:09:35 -07:00
glassmancody.info
7370acdf54 Merge remote-tracking branch 'upstream/master' into why_are_the_christmas_lights_still_up 2021-04-13 11:09:19 -07:00
glassmancody.info
43ac32921c Rewrite, support different lighting methods 2021-04-13 11:09:19 -07:00
glassmancody.info
9d9074c244 Add shared UBO 2021-04-13 11:07:48 -07:00
glassmancody.info
dda735c54a initial commit 2021-04-13 11:06:16 -07:00
Andrei Kortunov
1ab5a9f530 Revert "Merge branch 'refractiontest' into 'master'"
This reverts commit b31459cc00, reversing
changes made to 369adf1583.
2021-03-30 15:32:01 +04:00
Alexei Dobrohotov
2fdbe9b3f6 Handle BSShader[PP/No]LightingProperty 2021-03-22 01:55:58 +03:00
wareya
2ea0bf91e6 try to estimate vertical water depth, not screen-direction water depth 2021-03-20 13:11:19 -04:00
wareya
56fe1a8c12 wobbly water 2021-03-19 21:49:17 -04:00
wareya
1a4e9df707 add bit to suppress coastline artifacts at more of a distance 2021-03-19 20:12:40 -04:00
wareya
bf336e4cb4 make sun scattering color stop being an ugly radioactive green 2021-03-19 18:51:52 -04:00
wareya
845e3944d6 make refraction more visible even at a distance 2021-03-19 17:54:08 -04:00
AnyOldName3
34af58f53f Use correct extension name.
Like 0068c7bb25, but for other shaders, too
2021-03-13 23:02:48 +00:00
AnyOldName3
3103266406 Add correct preprocessor check when enabling extension 2021-03-13 01:31:35 +00:00
AnyOldName3
0431ba4c87 Merge branch 'alpha-meddling-shader-side-mip-meddling' into alpha-meddling 2021-03-13 01:23:30 +00:00
AnyOldName3
b8ee32e317 Support A2C for groundcover 2021-02-14 23:32:04 +00:00
AnyOldName3
4f510d85ba Merge remote-tracking branch 'upstream/master' into alpha-meddling 2021-02-14 22:42:55 +00:00
AnyOldName3
f8f6d63d4c Optimise groundcover lighting 2021-02-09 21:56:21 +00:00
Andrei Kortunov
e3490c8606 Remove dead code 2021-01-26 22:29:41 +04:00
Andrei Kortunov
36fc573375 Take in account Z direction for stomping 2021-01-26 22:29:41 +04:00
Andrei Kortunov
5124e81348 Use linear interpolation instead of abrupt transitions for groundcover lighting 2021-01-26 22:29:41 +04:00
Andrei Kortunov
14cf0ce1dc Implement instanced groundcover 2021-01-26 22:29:41 +04:00
AnyOldName3
b6e92c9c6d Use ShaderVisitor to skip translucent framebuffer specific stuff 2021-01-20 23:37:19 +00:00
AnyOldName3
8af8ad3840 Always write opaque fragments instead of relying on blending being off for translucent RTT 2021-01-20 01:17:16 +00:00
AnyOldName3
0068c7bb25 Spec says GL_ 2021-01-08 17:32:15 +00:00
AnyOldName3
4ed3252001 Check for EXT_gpu_shader4 CPU-side
Mesa lies and always defines GL_EXT_gpu_shader4 even when the extension
isn't present.
2021-01-07 18:13:51 +00:00
AnyOldName3
d13459ecf9 Scale mipmap alpha to preserve coverage 2021-01-05 22:21:54 +00:00
AnyOldName3
69386df036 Correct alpha testing functions 2021-01-02 18:27:25 +00:00
AnyOldName3
9b99c76032 Clamp alpha reference to avoid degenerate case 2021-01-01 16:01:33 +00:00
AnyOldName3
54d465e3dc Do all alpha testing early and only once 2020-12-27 03:07:04 +00:00
AnyOldName3
5e004356a2 Merge remote-tracking branch 'upstream/master' into alpha-meddling 2020-12-27 02:48:42 +00:00
AnyOldName3
8f4b856b44 Initial A2C implementation 2020-12-26 22:45:53 +00:00
Alexei Dobrohotov
09759c6620 Clean up shader lighting 2020-12-22 04:46:35 +03:00
AnyOldName3
a4f32a469e Work around Nvidia driver bug
https://www.khronos.org/registry/OpenGL/specs/gl/GLSLangSpec.1.20.pdf
Section 4.1.3 says that hexadecimal integer literals are supported, but
Nvidia have never read a specification since their founding, so their
engineers didn't know that hexadecimal integer literals are requires to
be supported to advertise support OpenGL versions with GLSL support.
2020-12-18 01:36:20 +00:00
AnyOldName3
ce2bcba5d4 Replace deprecated alpha test in shader visitor 2020-12-17 14:57:43 +00:00
psi29a
6f0b90e606 documented that currently underwater shadows are mutually exclusive to refraction scale; to be fixed in follow up issue #5709; documentation fixes 2020-12-02 23:03:10 +00:00
Bret Curtis
355996c2ff supress -> suppress 2020-06-27 01:20:57 +02:00
Andrei Kortunov
9bc0e9b4b7 Fix typos in shaders 2020-06-17 10:13:52 +04:00
Andrei Kortunov
f30cb9f8bc Calculate viewNormal only when needed 2020-06-15 12:57:37 +04:00
Capostrophic
91514aed5d Don't deliberately do redundant assignments 2020-06-09 22:08:43 +03:00
Capostrophic
1c50d25853 Minor shader fixes
Don't initialize uniform bool to false explicitly
Attempt not to calculate specular lighting if the material specular color is black
2020-06-09 15:27:38 +03:00
Capostrophic
58d78fb126 Always pass the vertex color to the fragment shader 2020-05-12 18:28:07 +03:00
Capostrophic
c0b322b264 Improve color mode handling in shaders 2020-05-09 16:15:10 +03:00
psi29a
b72720f357 Merge branch 'shadow-transparency-rework' into 'master'
Only alpha-test shadows when necessary

See merge request OpenMW/openmw!170
2020-05-08 21:32:16 +00:00
Bret Curtis
aaa8990006
Merge pull request #2799 from Capostrophic/simplewaterfog
Fix simple water with radial fog enabled
2020-05-08 20:48:04 +02:00