Skip to content

Commit 94fa13d

Browse files
bagnellbagnell
authored
Merge pull request #5755 from AnalyticalGraphicsInc/invertable-style
Invertable classification with alpha
2 parents 099abba + e16d16c commit 94fa13d

File tree

4 files changed

+304
-18
lines changed

4 files changed

+304
-18
lines changed

‎Apps/Sandcastle/gallery/3D Tiles Classification.html

+181
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,181 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="utf-8">
5+
<meta http-equiv="X-UA-Compatible" content="IE=edge">
6+
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no">
7+
<meta name="description" content="A sample photgrammetry dataset rendered with 3D Tiles.">
8+
<meta name="cesium-sandcastle-labels" content="Showcases, 3D Tiles">
9+
<title>Cesium Demo</title>
10+
<script type="text/javascript" src="../Sandcastle-header.js"></script>
11+
<script type="text/javascript" src="../../../ThirdParty/requirejs-2.1.20/require.js"></script>
12+
<script type="text/javascript">
13+
require.config({
14+
baseUrl : '../../../Source',
15+
waitSeconds : 60
16+
});
17+
</script>
18+
</head>
19+
<body class="sandcastle-loading" data-sandcastle-bucket="bucket-requirejs.html">
20+
<style>
21+
@import url(../templates/bucket.css);
22+
</style>
23+
<div id="cesiumContainer" class="fullSize"></div>
24+
<div id="loadingOverlay"><h1>Loading...</h1></div>
25+
<div id="toolbar">
26+
<table><tbody>
27+
<tr>
28+
<td>show volume</td>
29+
<td><input type="checkbox" data-bind="checked: enabled" /></td>
30+
</tr>
31+
<tr>
32+
<td>invert classification</td>
33+
<td><input type="checkbox" data-bind="checked: inverted" /></td>
34+
</tr>
35+
<tr>
36+
<td>inverted red</td>
37+
<td>
38+
<input type="range" min="0.0" max="1.0" step="0.01" data-bind="value: invertedRed, valueUpdate: 'input'">
39+
<input type="text" size="3" data-bind="value: invertedRed">
40+
</td>
41+
</tr>
42+
<tr>
43+
<td>inverted green</td>
44+
<td>
45+
<input type="range" min="0.0" max="1.0" step="0.01" data-bind="value: invertedGreen, valueUpdate: 'input'">
46+
<input type="text" size="3" data-bind="value: invertedGreen">
47+
</td>
48+
</tr>
49+
<tr>
50+
<td>inverted blue</td>
51+
<td>
52+
<input type="range" min="0.0" max="1.0" step="0.01" data-bind="value: invertedBlue, valueUpdate: 'input'">
53+
<input type="text" size="3" data-bind="value: invertedBlue">
54+
</td>
55+
</tr>
56+
<tr>
57+
<td>inverted alpha</td>
58+
<td>
59+
<input type="range" min="0.0" max="1.0" step="0.01" data-bind="value: invertedAlpha, valueUpdate: 'input'">
60+
<input type="text" size="3" data-bind="value: invertedAlpha">
61+
</td>
62+
</tr>
63+
</tbody></table>
64+
</div>
65+
<script id="cesium_sandcastle_script">
66+
function startup(Cesium) {
67+
'use strict';
68+
//Sandcastle_Begin
69+
var viewer = new Cesium.Viewer('cesiumContainer');
70+
viewer.scene.debugShowFramesPerSecond = true;
71+
72+
viewer.scene.primitives.add(new Cesium.Cesium3DTileset({
73+
url : 'https://beta.cesium.com/api/assets/1458?access_token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiIxYmJiNTAxOC1lOTg5LTQzN2EtODg1OC0zMWJjM2IxNGNlYmMiLCJpZCI6NDQsImFzc2V0cyI6WzE0NThdLCJpYXQiOjE0OTkyNjM4MjB9.1WKijRa-ILkmG6utrhDWX6rDgasjD7dZv-G5ZyCmkKg'
74+
}));
75+
76+
var classification = viewer.scene.primitives.add(new Cesium.Cesium3DTileset({
77+
url : 'http://localhost:8002/tilesets/meshTest/'
78+
}));
79+
80+
classification.readyPromise.then(function(tileset) {
81+
var boundingSphere = tileset.boundingSphere;
82+
viewer.camera.viewBoundingSphere(boundingSphere, new Cesium.HeadingPitchRange(0.0, -0.5, boundingSphere.radius));
83+
viewer.camera.lookAtTransform(Cesium.Matrix4.IDENTITY);
84+
85+
tileset.style = new Cesium.Cesium3DTileStyle({
86+
color : "rgba(255, 0, 0, 0.5)"
87+
});
88+
}).otherwise(function(error) {
89+
throw(error);
90+
});
91+
92+
viewer.scene.invertClassificationColor = new Cesium.Color(0.25, 0.25, 0.25, 1.0);
93+
94+
var HIGHLIGHT_COLOR = new Cesium.Color(1.0, 1.0, 0.0, 0.4);
95+
var current = {
96+
feature : undefined,
97+
originalColor : new Cesium.Color(),
98+
originalShow : undefined
99+
};
100+
101+
var handler = new Cesium.ScreenSpaceEventHandler(viewer.scene.canvas);
102+
handler.setInputAction(function(movement) {
103+
var pickedFeature = viewer.scene.pick(movement.endPosition);
104+
105+
if (Cesium.defined(current.feature) && (current.feature !== pickedFeature)) {
106+
// Restore original color to feature that is no longer selected
107+
108+
// This assignment is necessary to work with the set property
109+
current.feature.color = Cesium.Color.clone(current.originalColor, current.feature.color);
110+
current.feature.show = current.originalShow;
111+
current.feature = undefined;
112+
}
113+
114+
if (Cesium.defined(pickedFeature) && (pickedFeature !== current.feature)) {
115+
current.feature = pickedFeature;
116+
Cesium.Color.clone(pickedFeature.color, current.originalColor);
117+
current.originalShow = pickedFeature.show;
118+
119+
// Highlight newly selected feature
120+
pickedFeature.color = Cesium.Color.clone(HIGHLIGHT_COLOR, pickedFeature.color);
121+
pickedFeature.show = true;
122+
}
123+
}, Cesium.ScreenSpaceEventType.MOUSE_MOVE);
124+
125+
var viewModel = {
126+
enabled : classification.debugWireframe,
127+
inverted : viewer.scene.invertClassification,
128+
invertedRed : viewer.scene.invertClassificationColor.red,
129+
invertedGreen : viewer.scene.invertClassificationColor.green,
130+
invertedBlue : viewer.scene.invertClassificationColor.blue,
131+
invertedAlpha : viewer.scene.invertClassificationColor.alpha
132+
};
133+
Cesium.knockout.track(viewModel);
134+
var toolbar = document.getElementById('toolbar');
135+
Cesium.knockout.applyBindings(viewModel, toolbar);
136+
137+
Cesium.knockout.getObservable(viewModel, 'enabled').subscribe(
138+
function(newValue) {
139+
classification.debugWireframe = newValue;
140+
}
141+
);
142+
Cesium.knockout.getObservable(viewModel, 'inverted').subscribe(
143+
function(newValue) {
144+
viewer.scene.invertClassification = newValue;
145+
classification.style = new Cesium.Cesium3DTileStyle({
146+
color : 'rgba(255, 0, 0, 0.5)',
147+
show : !newValue
148+
});
149+
}
150+
);
151+
Cesium.knockout.getObservable(viewModel, 'invertedRed').subscribe(
152+
function(newValue) {
153+
viewer.scene.invertClassificationColor.red = parseFloat(newValue);
154+
}
155+
);
156+
Cesium.knockout.getObservable(viewModel, 'invertedGreen').subscribe(
157+
function(newValue) {
158+
viewer.scene.invertClassificationColor.green = parseFloat(newValue);
159+
}
160+
);
161+
Cesium.knockout.getObservable(viewModel, 'invertedBlue').subscribe(
162+
function(newValue) {
163+
viewer.scene.invertClassificationColor.blue = parseFloat(newValue);
164+
}
165+
);
166+
Cesium.knockout.getObservable(viewModel, 'invertedAlpha').subscribe(
167+
function(newValue) {
168+
viewer.scene.invertClassificationColor.alpha = parseFloat(newValue);
169+
}
170+
);
171+
//Sandcastle_End
172+
Sandcastle.finishedLoading();
173+
}
174+
if (typeof Cesium !== "undefined") {
175+
startup(Cesium);
176+
} else if (typeof require === "function") {
177+
require(["Cesium"], startup);
178+
}
179+
</script>
180+
</body>
181+
</html>

‎Source/Scene/Cesium3DTileBatchTable.js

+45
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ define([
2929
'./BlendingState',
3030
'./Cesium3DTileColorBlendMode',
3131
'./CullFace',
32+
'./DepthFunction',
3233
'./getBinaryAccessor',
3334
'./StencilFunction',
3435
'./StencilOperation'
@@ -63,6 +64,7 @@ define([
6364
BlendingState,
6465
Cesium3DTileColorBlendMode,
6566
CullFace,
67+
DepthFunction,
6668
getBinaryAccessor,
6769
StencilFunction,
6870
StencilOperation) {
@@ -1181,6 +1183,46 @@ define([
11811183
};
11821184
};
11831185

1186+
Cesium3DTileBatchTable.prototype.getPickVertexShaderCallbackIgnoreShow = function(batchIdAttributeName) {
1187+
if (this.featuresLength === 0) {
1188+
return;
1189+
}
1190+
1191+
var that = this;
1192+
return function(source) {
1193+
var renamedSource = ShaderSource.replaceMain(source, 'tile_main');
1194+
var newMain =
1195+
'varying vec2 tile_featureSt; \n' +
1196+
'void main() \n' +
1197+
'{ \n' +
1198+
' tile_main(); \n' +
1199+
' tile_featureSt = computeSt(' + batchIdAttributeName + '); \n' +
1200+
'}';
1201+
1202+
return renamedSource + '\n' + getGlslComputeSt(that) + newMain;
1203+
};
1204+
};
1205+
1206+
Cesium3DTileBatchTable.prototype.getPickFragmentShaderCallbackIgnoreShow = function() {
1207+
if (this.featuresLength === 0) {
1208+
return;
1209+
}
1210+
1211+
return function(source) {
1212+
var renamedSource = ShaderSource.replaceMain(source, 'tile_main');
1213+
var newMain =
1214+
'uniform sampler2D tile_pickTexture; \n' +
1215+
'varying vec2 tile_featureSt; \n' +
1216+
'void main() \n' +
1217+
'{ \n' +
1218+
' tile_main(); \n' +
1219+
' gl_FragColor = texture2D(tile_pickTexture, tile_featureSt); \n' +
1220+
'}';
1221+
1222+
return renamedSource + '\n' + newMain;
1223+
};
1224+
};
1225+
11841226
Cesium3DTileBatchTable.prototype.getPickUniformMapCallback = function() {
11851227
if (this.featuresLength === 0) {
11861228
return;
@@ -1348,6 +1390,9 @@ define([
13481390
// selection depth to the stencil buffer to prevent ancestor tiles from drawing on top
13491391
derivedCommand = DrawCommand.shallowClone(command);
13501392
var rs = clone(derivedCommand.renderState, true);
1393+
if (rs.depthTest.enabled && rs.depthTest.func === DepthFunction.LESS) {
1394+
rs.depthTest.func = DepthFunction.LESS_OR_EQUAL;
1395+
}
13511396
// Stencil test is masked to the most significant 4 bits so the reference is shifted.
13521397
// This is to prevent clearing the stencil before classification which needs the least significant
13531398
// bits for increment/decrement operations.

‎Source/Scene/Vector3DTilePolylines.js

-2
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,6 @@ define([
431431
shaderProgram : primitive._sp,
432432
uniformMap : uniformMap,
433433
boundingVolume : primitive._boundingVolume,
434-
//pass : Pass.GROUND
435434
pass : Pass.TRANSLUCENT
436435
});
437436
}
@@ -449,7 +448,6 @@ define([
449448
shaderProgram : primitive._spPick,
450449
uniformMap : uniformMap,
451450
boundingVolume : primitive._boundingVolume,
452-
//pass : Pass.GROUND
453451
pass : Pass.TRANSLUCENT
454452
});
455453
}

0 commit comments

Comments
 (0)