Fix shadowed models in 2D #4382
Merged
Conversation
This file contains 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
… is allowed. One for just OIT in 2D and one with OIT + shadows for 3D/CV.
lilleyse
reviewed
Sep 29, 2016
| derivedCommands.oit = oit.createDerivedCommands(command, context, derivedCommands.oit); | ||
| } | ||
| if (lightShadowsEnabled && command.receiveShadows) { | ||
| derivedCommands.oit.shadows = oit.createDerivedCommands(command.derivedCommands.shadows.receiveCommand, context, derivedCommands.oit.shadows); | ||
| } |
There was a problem hiding this comment.
Similarly I think this area can be
if (lightShadowsEnabled && command.receiceShadows) {
create derivedCommands.oit.shadows
} else {
create derivedCommands.oit
}
lilleyse
reviewed
Sep 29, 2016
| @@ -525,6 +527,9 @@ define([ | |||
| var framebuffer = passState.framebuffer; | |||
| var length = commands.length; | |||
|
|
|||
| var shadowsEnabled = scene.frameState.shadowHints.shadowsEnabled; | |||
| var scene2D = scene.mode === SceneMode.SCENE2D; | |||
There was a problem hiding this comment.
You don't have to check for SCENE2D here - scene.frameState.shadowHints.shadowsEnabled will be false if the scene isn't 3D.
|
Tested and the code looks good to me, @pjcozzi do you want to take a look? |
|
@bagnell update CHANGES.md in master. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Creates two sets of derived OIT commands when changing the scene mode is allowed. One for just OIT in 2D and one with OIT + shadows for 3D/CV.
Fixes #4378.
CC @pjcozzi @lilleyse