Cosmic Linden
|
45547c7bba
|
DRTVWR-592: Attempt to fix Mac build
|
2023-10-13 16:19:20 -07:00 |
|
Cosmic Linden
|
a91f08ba84
|
Merge branch 'DRTVWR-559' into DRTVWR-592
|
2023-10-13 14:02:51 -07:00 |
|
Cosmic Linden
|
cc0f831aaa
|
DRTVWR-592: Fix PBR terrain shader compile crash when emissive textures are disabled
|
2023-10-13 10:43:18 -07:00 |
|
Cosmic Linden
|
8d9933b370
|
DRTVWR-592: EXTRA_CODE_HERE is actually important - bring that back
|
2023-10-13 10:43:13 -07:00 |
|
Cosmic Linden
|
f3c98a548a
|
DRTVWR-592: Clean up
|
2023-10-13 10:43:08 -07:00 |
|
Cosmic Linden
|
f9bd70efc9
|
DRTVWR-592: Fix non-triplanar being slower somehow in some cases.
|
2023-10-13 10:43:02 -07:00 |
|
Cosmic Linden
|
be38adebbe
|
DRTVWR-592: Add missing branching for terrain sampling. Jury is still out on which version is faster
|
2023-10-13 10:42:56 -07:00 |
|
Cosmic Linden
|
b162ff3cae
|
DRTVWR-592: Implement reduced branching terrain shader
|
2023-10-13 10:42:50 -07:00 |
|
Cosmic Linden
|
b163f72ecc
|
DRTVWR-592: (WIP) (has debug) Add new functions for mixing PBR materials. Not yet used.
|
2023-10-13 10:42:44 -07:00 |
|
Cosmic Linden
|
00d56e2607
|
DRTVWR-592: Disable (but do not remove) shader debug
|
2023-10-13 10:42:39 -07:00 |
|
Cosmic Linden
|
86f0c9faa8
|
DRTVWR-592: (WIP) (has debug) Fix PBR terrain material mixing and triplanar mapping using wrong mix, causing bright spots
|
2023-10-13 10:42:35 -07:00 |
|
Cosmic Linden
|
1d885181d8
|
DRTVWR-592: (WIP) (has debug) Apply triplanar optimization technique to PBR material sampling. Use slightly different alpha ramp to hide unused materials
|
2023-10-13 10:42:29 -07:00 |
|
Cosmic Linden
|
6e949e5d63
|
DRTVWR-592: Remove shader cruft
|
2023-10-13 10:42:24 -07:00 |
|
Cosmic Linden
|
b1a3a274ff
|
DRTVWR-592: Don't read UVs for PBR terrain in single-plane case - works out to be more expensive than triplanar in some cases, and UVs are already trivial
|
2023-10-13 10:42:18 -07:00 |
|
Cosmic Linden
|
fa11e94c3c
|
DRTVWR-592: Clean up debug and test cases for ant trails artifact. Fix whitespace
|
2023-10-13 10:42:12 -07:00 |
|
Cosmic Linden
|
c48837ef9b
|
DRTVWR-592: (WIP) (has debug) More rigorous definition of usage vector for triplanar that avoids possible case where 1 = 0.9999, which gets rounded down to 0 on int cast
|
2023-10-13 10:42:07 -07:00 |
|
Cosmic Linden
|
823fcddcb5
|
DRTVWR-592: (WIP) (has debug) Fix removing axial sign flip of normal texture during zero check, add another zero check
|
2023-10-13 10:42:02 -07:00 |
|
Cosmic Linden
|
be39e92f7d
|
DRTVWR-592: (WIP) (has debug) Fix "ant trail" seams in terrain caused by multiple texture lookups in a switch..case block
|
2023-10-13 10:41:19 -07:00 |
|
Cosmic Linden
|
fb12fb4bf7
|
DRTVWR-592: (DEBUG) (broken) Clean up a few debug cases not used for reproducing the bug
|
2023-10-13 10:40:29 -07:00 |
|
Cosmic Linden
|
aba9185f3a
|
DRTVWR-592: (DEBUG) (broken) Strange sampling behavior isolated to switch..case blocks
|
2023-10-13 10:40:24 -07:00 |
|
Cosmic Linden
|
d745b63213
|
DRTVWR-592: (DEBUG) (broken) Strange sampling behavior survives weight bypass
|
2023-10-13 10:40:19 -07:00 |
|
Cosmic Linden
|
a9a08f72be
|
DRTVWR-592: (WIP) Cleanup
|
2023-10-13 10:40:13 -07:00 |
|
Cosmic Linden
|
53a5055ab7
|
DRTVWR-592: (WIP) (has debug) Convert colors to linear before triplanar blending. General refactor.
|
2023-10-13 10:40:07 -07:00 |
|
Cosmic Linden
|
e6777d566f
|
DRTVWR-592: Fix not thresholding texture lookups for non-normal textures. Also decrease threshold to (hopefully) reasonable level
|
2023-10-13 10:40:02 -07:00 |
|
Cosmic Linden
|
bb0ae367d7
|
DRTVWR-592: (WIP) Test impact of higher threshold on performance and visuals
|
2023-10-13 10:39:56 -07:00 |
|
Cosmic Linden
|
a8d69a4bae
|
DRTVWR-592: Fix weights
|
2023-10-13 10:39:50 -07:00 |
|
Cosmic Linden
|
2895b7bf81
|
DRTVWR-592: Triplanar performance pass
|
2023-10-13 10:39:45 -07:00 |
|
Cosmic Linden
|
3e3a3c1c52
|
DRTVWR-592: Fix terrain normal sampling in non-triplanar case
|
2023-10-13 10:39:40 -07:00 |
|
Cosmic Linden
|
db4bc52829
|
DRTVWR-592: (WIP) PBR Terrain: Improve orientation of textures and normal maps for triplanar mapping, minor cleanup
|
2023-10-13 10:39:34 -07:00 |
|
Cosmic Linden
|
23ca385f3d
|
DRTVWR-592: Give PBR terrain shader more descriptive name for debugging/profiling
|
2023-10-13 10:39:28 -07:00 |
|
Cosmic Linden
|
ed973f4cbc
|
DRTVWR-592: Add test config for triplanar mapping blend strength
|
2023-10-13 10:39:22 -07:00 |
|
Cosmic Linden
|
2dc3f3ade1
|
DRTVWR-592: Add triplanar mapping setting, gate to High graphics setting or higher, bump feature table
|
2023-10-13 10:39:16 -07:00 |
|
Cosmic Linden
|
754fe9d4b7
|
DRTVWR-592: (WIP) Triplanar mapping
|
2023-10-13 10:39:09 -07:00 |
|
Cosmic Linden
|
ab3b4edac7
|
DRTVWR-592: Fix broken minimap loading, improve minimap view of PBR materials (still not accurate, but better...)
|
2023-10-13 10:39:03 -07:00 |
|
Cosmic Linden
|
7f74318916
|
DRTVWR-592: Add tracy block to gen_terrain_tangents (not profiled)
|
2023-10-13 10:38:59 -07:00 |
|
Cosmic Linden
|
d6aced7abf
|
DRTVWR-592: Remove WIP separate code path for terrain geometry rebuilds for PBR as that is not needed at the moment
|
2023-10-13 10:38:54 -07:00 |
|
Cosmic Linden
|
35d889f7af
|
DRTVWR-592: Create separate config option for terrain repeats. Clean up debug
|
2023-10-13 10:38:48 -07:00 |
|
Cosmic Linden
|
b9ba57fd00
|
DRTVWR-592: (WIP) Fix terrain PBR texture repeat seam. Legacy terrain texture repeats currently broken
|
2023-10-13 10:38:42 -07:00 |
|
Cosmic Linden
|
57433341ab
|
Revert "Revert "DRTVWR-592: (WIP) Fix tiling only in the PBR case. Begin hooking up code for PBR-specific terrain geometry updates. Unfortunately, this version has a bug which can cause rebuilds to be skipped. Needs more work/testing""
This reverts commit 2318d65766.
|
2023-10-13 10:36:51 -07:00 |
|
Cosmic Linden
|
a65c9dad55
|
DRTVWR-592: Another attempt to fix Mac build: remove deprecated use of texture2D
|
2023-10-13 10:33:21 -07:00 |
|
Cosmic Linden
|
cbf202d632
|
SL-19750: Only disable PBR terrain emissive for machines that have a limit of 16 texture binds. Bump featuretable
|
2023-10-13 10:33:18 -07:00 |
|
Cosmic Linden
|
dfa19c5e43
|
DRTVWR-592: PBR terrain fallback for Mac/Intel: Drop emissive texture. Bump featuretable.
|
2023-10-13 10:33:16 -07:00 |
|
Cosmic Linden
|
2318d65766
|
Revert "DRTVWR-592: (WIP) Fix tiling only in the PBR case. Begin hooking up code for PBR-specific terrain geometry updates. Unfortunately, this version has a bug which can cause rebuilds to be skipped. Needs more work/testing"
This reverts commit de9184479c.
|
2023-10-13 10:31:51 -07:00 |
|
Cosmic Linden
|
de9184479c
|
DRTVWR-592: (WIP) Fix tiling only in the PBR case. Begin hooking up code for PBR-specific terrain geometry updates. Unfortunately, this version has a bug which can cause rebuilds to be skipped. Needs more work/testing
|
2023-10-13 09:58:50 -07:00 |
|
Cosmic Linden
|
3b3ba3623a
|
DRTVWR-592: Overdraw is not free. Render terrain after Opaque Blinn-Phong/PBR have populated the foreground
|
2023-10-13 09:58:43 -07:00 |
|
Cosmic Linden
|
1820f23b96
|
DRTVWR-592: Fix issues with blending of materials, for example when fading out an emissive texture. Also affects base color and ORM
|
2023-10-13 09:58:35 -07:00 |
|
Cosmic Linden
|
d2da776980
|
DRTVWR-592: Fix some virtual functions not being marked override
|
2023-10-13 09:58:27 -07:00 |
|
Cosmic Linden
|
14c3730bf1
|
DRTVWR-592: Fix unable to undo effect of local terrain debug setting without restarting viewer
|
2023-10-13 09:58:20 -07:00 |
|
Cosmic Linden
|
94d8f669ac
|
DRTVWR-592: Add debug options LocalTerrainAssetN. Fix PBR terrain texture flickering
|
2023-10-13 09:58:13 -07:00 |
|
Cosmic Linden
|
039116abd4
|
DRTVWR-592: (WIP) Roughly working draft of PBR terrain
|
2023-10-13 09:58:05 -07:00 |