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

[merc2] Support texscroll, use in jak 1 in more places, fix envmap bug #2303

Merged
merged 5 commits into from
Mar 10, 2023

Conversation

water111
Copy link
Collaborator

@water111 water111 commented Mar 9, 2023

Three main changes:

  • Adds support for the texture scrolling effect used on conveyor belts, and turn it on for jak 2.
  • Use merc instead of generic in jak 1 for ripple/water/texscroll stuff (non-ocean water, lava, dark eco, etc). This is a pretty big speedup in a lot of places.
  • Fix a really old bug with blending mode used to draw environment maps. The effect is that envmaps were half as bright as they should have been.

As usual, there's a flag to go back to the old behavior on jak 1. Set these to #t to use generic like we used to.

*texscroll-force-generic*
*ripple-force-generic*

The format has changed, and everything must be rebuilt (C++, FR3's, GOAL code)

@ManDude
Copy link
Member

ManDude commented Mar 9, 2023

merc doesn't render dark eco properly:
image

generic:
image

@water111 water111 merged commit 0db9b28 into master Mar 10, 2023
@water111 water111 deleted the w/merc-texscroll-and-fixes branch March 10, 2023 01:01
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.

2 participants