Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Water shader enhancements #111

Merged
merged 17 commits into from
Oct 19, 2022
Merged

Water shader enhancements #111

merged 17 commits into from
Oct 19, 2022

Conversation

JamesTKhan
Copy link
Owner

@JamesTKhan JamesTKhan commented Oct 17, 2022

  • Add ability to toggle water reflections/refractions
  • Add customizable color to water
  • Add Visible Depth field which blends into the water color beyond a certain depth
  • Attempt to reduce artifacts on water edges/shores
  • Minor performance tweaks (reusing texture attributes instead of instantiating new)
  • Update water widget UI to include ToolTips!

…ements

# Conflicts:
#	commons/src/main/com/mbrlabs/mundus/commons/assets/WaterAsset.java
#	commons/src/main/com/mbrlabs/mundus/commons/shaders/WaterUberShader.java
#	commons/src/main/com/mbrlabs/mundus/commons/shaders/water.uber.frag.glsl
#	commons/src/main/com/mbrlabs/mundus/commons/water/Water.java
#	commons/src/main/com/mbrlabs/mundus/commons/water/attributes/WaterFloatAttribute.java
#	editor/src/main/com/mbrlabs/mundus/editor/assets/EditorAssetManager.kt
#	editor/src/main/com/mbrlabs/mundus/editor/ui/widgets/WaterWidget.kt
@JamesTKhan JamesTKhan linked an issue Oct 17, 2022 that may be closed by this pull request
@JamesTKhan JamesTKhan marked this pull request as ready for review October 18, 2022 18:54
@JamesTKhan JamesTKhan merged commit 3fab9fd into master Oct 19, 2022
@JamesTKhan JamesTKhan deleted the water-shader-enhancements branch October 19, 2022 13:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Ability to disable water reflections/refractions
1 participant