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

Terrain Cleanup #4550

Merged
merged 6 commits into from Mar 4, 2019

Conversation

Projects
None yet
4 participants
@fluffyfreak
Copy link
Contributor

commented Mar 3, 2019

Some Terrain changes and tidying up:

  • Remove fractal and terrain "texture" options - fix them as always on and average
  • Change terrain patch geometry to have low/med/high options only, and to be (power-of-2)+1 sizes
  • Move generation methods into request classes
  • Remove all old GL2 shaders since they're defunct
  • Detail mapping is mandatory!
  • Add standardised BiCubicInterpolation method for sampling from heightmaps
  • Cache the inverse of m_planetRadius and use it for mul instead of div as minor optimisation

There's a lot of changes in here but they all follow the same theme of removing things and cleaning up a little bit.

The goal is to simplify terrain stuff a bit and make it easier to work on in the future.

@fluffyfreak fluffyfreak changed the title Terrain exp Terrain Cleanup Mar 3, 2019

@impaktor

This comment has been minimized.

Copy link
Member

commented Mar 3, 2019

I suspect only you can review this, so merge when you feel ready.

@laarmen

This comment has been minimized.

Copy link
Contributor

commented Mar 3, 2019

I'm curious, what's the rationale behind the (2^n)+1 ? I'm more used to having a -1 ;-)

@jaj22

This comment has been minimized.

Copy link
Contributor

commented Mar 3, 2019

@laarmen (2^n)+1 is natural for quadtree terrain vertex counts. For example, a patch with 8x8 quads will have 9 vertices per side. It was always annoying for storage.

@fluffyfreak fluffyfreak merged commit ed11f71 into pioneerspacesim:master Mar 4, 2019

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@fluffyfreak fluffyfreak deleted the fluffyfreak:terrain-exp branch Mar 4, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.