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

3D Tiles - Support vectors in the styling language #4759

Merged
merged 4 commits into from
Jan 6, 2017
Merged

3D Tiles - Support vectors in the styling language #4759

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
12cbbfe
Support vectors in the styling language
lilleyse Dec 14, 2016
a5d9c37
Typo
lilleyse Dec 15, 2016
7726151
Merge branch '3d-tiles' into vector
lilleyse Jan 5, 2017
d76dade
Support vec2, vec3, and vec4 as distinct types
lilleyse Jan 6, 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: 8 additions & 7 deletions Apps/Sandcastle/gallery/3D Tiles Point Cloud Styling.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,18 +130,18 @@
});

addStyle('Min and Max', {
color : "rgb(min(${POSITION}[0], 0.75) * 255, max(${POSITION}[2], 0.25) * 255, 255)",
color : "rgb(min(${POSITION}.x, 0.75) * 255, max(${POSITION}.z, 0.25) * 255, 255)",
pointSize : "5"
});

// secondaryColor is originally a vec3 - so add vec4(0.0, 0.0, 0.0, 1.0) to make the point cloud opaque
addStyle('Secondary Color', {
color : {
expression : "[${secondaryColor}[0], ${secondaryColor}[1], ${secondaryColor}[2], 1.0]",
conditions : [
["${id} < 250", "${expression}"],
["${id} < 500", "${expression} * ${expression}"],
["${id} < 750", "${expression} / 5.0"],
["${id} < 1000", "rgb(0, 0, Number(${expression}[0] < 0.5) * 255)"]
["${id} < 250", "${secondaryColor} + vec4(0.0, 0.0, 0.0, 1.0)"],
["${id} < 500", "${secondaryColor} * ${secondaryColor} + vec4(0.0, 0.0, 0.0, 1.0)"],
["${id} < 750", "${secondaryColor} / 5.0 + vec4(0.0, 0.0, 0.0, 1.0)"],
["${id} < 1000", "rgb(0, 0, Number(${secondaryColor}.x < 0.5) * 255)"]
]
}
});
Expand All @@ -154,8 +154,9 @@
show : "${POSITION}[0] > 0.5 || ${POSITION}[1] > 0.5 || ${POSITION}[2] > 0.5"
});

// POSITION contains 0 as its last component, so add 1.0 to make the point cloud opaque
addStyle('Color based on position', {
color : "rgb(${POSITION}[0] * 255, ${POSITION}[1] * 255, ${POSITION}[2] * 255)"
color : "${POSITION} + vec4(0.0, 0.0, 0.0, 1.0)"
});

addStyle('Style point size', {
Expand Down
Loading