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.

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

Jump to bottom

Optimize QuantizedMeshTerrainData.interpolateHeight #7508

Merged
merged 6 commits into from
Jan 25, 2019
Merged

Optimize QuantizedMeshTerrainData.interpolateHeight #7508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
83afecd
Use a faster check to find if point is inside triangle in QuantizedMe…
shehzan10 Jan 24, 2019
fa3c734
Move spec test point inside the tile edge (was outside tile)
shehzan10 Jan 24, 2019
7b4b727
Update CHANGES.md
shehzan10 Jan 24, 2019
6355a84
Point in triangle should check for on triangle, revert spec changes
shehzan10 Jan 24, 2019
40d6c44
Slightly better fix for points on edge
shehzan10 Jan 24, 2019
4698bb2
Use bounding box test instead of point in triangle
shehzan10 Jan 25, 2019
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
1 change: 1 addition & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ Change Log
* Added a [new Sandcastle example](https://cesiumjs.org/Cesium/Build/Apps/Sandcastle/?src=Time%20Dynamic%20Wheels.html) on using `nodeTransformations` to rotate a model's wheels based on its velocity. [#7361](https://github.com/AnalyticalGraphicsInc/cesium/pull/7361)
* Added `EllipsoidRhumbLine` class as a rhumb line counterpart to `EllipsoidGeodesic`. [#7484](https://github.com/AnalyticalGraphicsInc/cesium/pull/7484)
* Added rhumb line support to `PolygonGeometry`, `PolygonOutlineGeometry`, `PolylineGeometry`, `GroundPolylineGeometry`, and `SimplePolylineGeometry`. [#7492](https://github.com/AnalyticalGraphicsInc/cesium/pull/7492)
* Improved the performance of `QuantizedMeshTerrainData.interpolateHeight`. [#7508](https://github.com/AnalyticalGraphicsInc/cesium/pull/7508)

##### Fixes :wrench:
* Fixed 3D Tiles performance regression. [#7482](https://github.com/AnalyticalGraphicsInc/cesium/pull/7482)
Expand Down
36 changes: 24 additions & 12 deletions Source/Core/QuantizedMeshTerrainData.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,6 +498,14 @@ define([
return interpolateMeshHeight(this, u, v);
};

function pointInBoundingBox(u, v, u0, v0, u1, v1, u2, v2) {
var minU = Math.min(u0, u1, u2);
var maxU = Math.max(u0, u1, u2);
var minV = Math.min(v0, v1, v2);
var maxV = Math.max(v0, v1, v2);
return (u >= minU && u <= maxU && v >= minV && v <= maxV);
}

var texCoordScratch0 = new Cartesian2();
var texCoordScratch1 = new Cartesian2();
var texCoordScratch2 = new Cartesian2();
Expand All @@ -517,12 +525,14 @@ define([
var uv1 = encoding.decodeTextureCoordinates(vertices, i1, texCoordScratch1);
var uv2 = encoding.decodeTextureCoordinates(vertices, i2, texCoordScratch2);

var barycentric = Intersections2D.computeBarycentricCoordinates(u, v, uv0.x, uv0.y, uv1.x, uv1.y, uv2.x, uv2.y, barycentricCoordinateScratch);
if (barycentric.x >= -1e-15 && barycentric.y >= -1e-15 && barycentric.z >= -1e-15) {
var h0 = encoding.decodeHeight(vertices, i0);
var h1 = encoding.decodeHeight(vertices, i1);
var h2 = encoding.decodeHeight(vertices, i2);
return barycentric.x * h0 + barycentric.y * h1 + barycentric.z * h2;
if (pointInBoundingBox(u, v, uv0.x, uv0.y, uv1.x, uv1.y, uv2.x, uv2.y)) {
var barycentric = Intersections2D.computeBarycentricCoordinates(u, v, uv0.x, uv0.y, uv1.x, uv1.y, uv2.x, uv2.y, barycentricCoordinateScratch);
if (barycentric.x >= -1e-15 && barycentric.y >= -1e-15 && barycentric.z >= -1e-15) {
var h0 = encoding.decodeHeight(vertices, i0);
var h1 = encoding.decodeHeight(vertices, i1);
var h2 = encoding.decodeHeight(vertices, i2);
return barycentric.x * h0 + barycentric.y * h1 + barycentric.z * h2;
}
}
}

Expand All @@ -549,12 +559,14 @@ define([
var v1 = vBuffer[i1];
var v2 = vBuffer[i2];

var barycentric = Intersections2D.computeBarycentricCoordinates(u, v, u0, v0, u1, v1, u2, v2, barycentricCoordinateScratch);
if (barycentric.x >= -1e-15 && barycentric.y >= -1e-15 && barycentric.z >= -1e-15) {
var quantizedHeight = barycentric.x * heightBuffer[i0] +
barycentric.y * heightBuffer[i1] +
barycentric.z * heightBuffer[i2];
return CesiumMath.lerp(terrainData._minimumHeight, terrainData._maximumHeight, quantizedHeight / maxShort);
if (pointInBoundingBox(u, v, u0, v0, u1, v1, u2, v2)) {
var barycentric = Intersections2D.computeBarycentricCoordinates(u, v, u0, v0, u1, v1, u2, v2, barycentricCoordinateScratch);
if (barycentric.x >= -1e-15 && barycentric.y >= -1e-15 && barycentric.z >= -1e-15) {
var quantizedHeight = barycentric.x * heightBuffer[i0] +
barycentric.y * heightBuffer[i1] +
barycentric.z * heightBuffer[i2];
return CesiumMath.lerp(terrainData._minimumHeight, terrainData._maximumHeight, quantizedHeight / maxShort);
}
}
}

Expand Down