Skip to content

Fix modelMatrix application in the project module #4183

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
merged 1 commit into from
Jan 23, 2020
Merged

Fix modelMatrix application in the project module #4183

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 11 additions & 10 deletions modules/core/src/shaderlib/project/project.glsl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,29 +106,30 @@ vec2 project_mercator_(vec2 lnglat) {
// Projects lnglats (or meter offsets, depending on mode) to common space
//
vec4 project_position(vec4 position, vec2 position64xyLow) {
// Apply model matrix
vec4 position_world = project_uModelMatrix * position;

// TODO - why not simply subtract center and fall through?
if (project_uCoordinateSystem == COORDINATE_SYSTEM_LNG_LAT) {
return project_uModelMatrix * vec4(
project_mercator_(position.xy) * WORLD_SCALE * project_uScale,
project_size(position.z),
position.w
return vec4(
project_mercator_(position_world.xy) * WORLD_SCALE * project_uScale,
project_size(position_world.z),
position_world.w
);
}

if (project_uCoordinateSystem == COORDINATE_SYSTEM_LNGLAT_AUTO_OFFSET) {
// Subtract high part of 64 bit value. Convert remainder to float32, preserving precision.
float X = position.x - project_uCoordinateOrigin.x;
float Y = position.y - project_uCoordinateOrigin.y;
return project_offset_(vec4(X + position64xyLow.x, Y + position64xyLow.y, position.z, position.w));
float X = position_world.x - project_uCoordinateOrigin.x;
float Y = position_world.y - project_uCoordinateOrigin.y;
return project_offset_(vec4(X + position64xyLow.x, Y + position64xyLow.y, position_world.z, position_world.w));
}

if (project_uCoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSETS) {
return project_offset_(position);
return project_offset_(position_world);
}

// METER_OFFSETS or IDENTITY
// Apply model matrix
vec4 position_world = project_uModelMatrix * position;
if (project_uCoordinateSystem == COORDINATE_SYSTEM_IDENTITY) {
position_world.xyz -= project_uCoordinateOrigin;
// Translation is already added to the high parts
Expand Down