renderer: add per-stage heightMap keyword (loose heightMap support)#252
Merged
illwieckz merged 2 commits intoDaemonEngine:masterfrom Dec 29, 2019
Merged
renderer: add per-stage heightMap keyword (loose heightMap support)#252illwieckz merged 2 commits intoDaemonEngine:masterfrom
illwieckz merged 2 commits intoDaemonEngine:masterfrom
Conversation
illwieckz
force-pushed
the
heightmap
branch
2 times, most recently
from
a55a46a to
9b7c4a0
Compare
illwieckz
force-pushed
the
heightmap
branch
4 times, most recently
from
a8a6083 to
157417f
Compare
slipher
reviewed
Dec 28, 2019
illwieckz
added a commit
to illwieckz/Daemon
that referenced
this pull request
Dec 28, 2019
also make USE_HEIGHTMAP_IN_NORMALMAP a macro, obsoletes DaemonEngine#189 About the collapse code collapsing heightmap stage while heightmap is a pre-colapsed stage attribute: > @slipher: The commit message says the heightmap is a per-stage attribute, but this looks like it's in a stage by itself? > @illwieckz: The dpMaterial DarkPlaces compatibility layer is not yet ported to the pre-collapsed stage code and I'm using Xonotic assets to test this feature, hence the temporary requirement to collapse a standalone heightmap stage. There is no keyword available to mapper to use the standalone heightmap stage, only the per-stage attribute, so there is no chance a mapper uses the standalone heightmap stage by mistake and we can drop it one day. DaemonEngine#252 (review)
slipher
reviewed
Dec 28, 2019
also make USE_HEIGHTMAP_IN_NORMALMAP a macro, obsoletes DaemonEngine#189 About the collapse code collapsing heightmap stage while heightmap is a pre-colapsed stage attribute: > @slipher: The commit message says the heightmap is a per-stage attribute, but this looks like it's in a stage by itself? > @illwieckz: The dpMaterial DarkPlaces compatibility layer is not yet ported to the pre-collapsed stage code and I'm using Xonotic assets to test this feature, hence the temporary requirement to collapse a standalone heightmap stage. There is no keyword available to mapper to use the standalone heightmap stage, only the per-stage attribute, so there is no chance a mapper uses the standalone heightmap stage by mistake and we can drop it one day. DaemonEngine#252 (review)
Member
|
LGTM |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR introduces the per-stage
heightMapkeyword to load loose heightMaps.