Skip to content

Prevent super tall pillars from appearing on oceans where there is no elevation data #63

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.

Sign up for GitHub

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

Merged
david-rhodes merged 3 commits into from
May 15, 2017
Merged

Prevent super tall pillars from appearing on oceans where there is no elevation data #63

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a2b708f
Merge branch 'release/release-v05.10'
May 1, 2017
853be7f
Oceans with no height data resolve in massively tall pillars. This
Spaxe May 11, 2017
7e483ef
Removed arbitrary height cap in favour of determing missing texture b…
Spaxe May 11, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions sdkproject/Assets/Mapbox/Core/Unity/MeshGeneration/Factories/TerrainFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public override void Update()
Run(tile);
}
}

private void Run(UnityTile tile)
{
if (_generationType == TerrainGenerationType.Height)
Expand Down Expand Up @@ -153,12 +153,19 @@ private void GenerateTerrainMesh(UnityTile tile, float heightMultiplier)
var xx = Mathd.Lerp(tile.Rect.Min.x, tile.Rect.Max.x, xrat);
var yy = Mathd.Lerp(tile.Rect.Min.y, tile.Rect.Max.y, yrat);

// Unavailable elevation data will have width less than 256
// (usually 8?), therefore we render at zero height
if (tile.HeightData.width < 256)
{
heightMultiplier = 0;
}

mesh.Vertices.Add(new Vector3(
(float)(xx - tile.Rect.Center.x),
heightMultiplier * Conversions.GetRelativeHeightFromColor(tile.HeightData.GetPixel(
(int)(xrat * 255),
(int)((1 - yrat) * 255)),
tile.RelativeScale),
(int)(xrat * 255),
(int)((1 - yrat) * 255)),
tile.RelativeScale),
(float)(yy - tile.Rect.Center.y)));
mesh.Normals.Add(Unity.Constants.Math.Vector3Up);
mesh.UV[0].Add(new Vector2(x * step, 1 - (y * step)));
Expand Down