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

Polylines and textured ground primitives on 3D Tiles #7456

Merged
merged 47 commits into from
Jan 3, 2019
+2,413 −1,562
Merged

Polylines and textured ground primitives on 3D Tiles #7456

Changes from 1 commit
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
06f133b
Set 3D Tiles stencil bit
lilleyse Dec 14, 2018
00e2d6a
Update ground primitive and classification primitive
lilleyse Dec 16, 2018
8171326
Fix vector tile wireframe
lilleyse Dec 17, 2018
056fa6c
Tests for Batched3DModel3DTileContentClassificationSpec
lilleyse Dec 17, 2018
3e8b578
Tests for ClassificationModelSpec
lilleyse Dec 17, 2018
4a2b0f4
Merge branch 'master' into stencil-tricks
lilleyse Dec 17, 2018
effcecd
ClassificationPrimitive and GlobePrimitive tests
lilleyse Dec 18, 2018
88b06bc
Cleanup Batch3dModel3DTileContentClassificationSpec
lilleyse Dec 19, 2018
34e66f9
Cleanup ClassificationModelSpec.js
lilleyse Dec 19, 2018
2a2cef0
Fix Geometry3DTileContent tests
lilleyse Dec 19, 2018
8163a79
Fix Vector3DTileContent tests
lilleyse Dec 19, 2018
99beaaa
Fixed Vector3DTileGeometry tests
lilleyse Dec 19, 2018
07e4093
Change default classification type of Vector3DTileGeoemtry and Vector…
lilleyse Dec 19, 2018
3f6ae77
Added tests for Vector3DTilePolygons
lilleyse Dec 19, 2018
e3a297c
Test cleanup
lilleyse Dec 19, 2018
33db32a
Updated CHANGES.md
lilleyse Dec 19, 2018
3dabb5c
Merge pull request #7422 from AnalyticalGraphicsInc/stencil-tricks
bagnell Dec 19, 2018
e610bef
Temp
lilleyse Dec 20, 2018
bb1e49c
Update GlobeDepth after 3D Tiles pass
lilleyse Dec 20, 2018
dd45faa
Support ground primitive batches for all classification types
lilleyse Dec 20, 2018
6a50bbc
Update Classification Types demo
lilleyse Dec 20, 2018
eeea2be
Change classification defaults to BOTH everywhere
lilleyse Dec 20, 2018
572102f
Fix tests
lilleyse Dec 20, 2018
adf2881
Optimization to not update depth or render CESUM_3D_TILE classificati…
lilleyse Dec 20, 2018
42cc67c
Doc updates
lilleyse Dec 20, 2018
c17cf47
Update CHANGES.md
lilleyse Dec 20, 2018
cea11ca
Fix for first frame after depthTestAgainstTerrain is disabled
lilleyse Dec 21, 2018
5e458c8
GroundPolylinePrimitive on 3D Tiles
lilleyse Dec 21, 2018
b1e01ef
Add support in entity layer
lilleyse Dec 22, 2018
3522388
Add ground polyline to clamp to 3D Tiles demo
lilleyse Dec 22, 2018
2d7f4e0
Doc fixes
lilleyse Dec 22, 2018
23a16ce
Fix 2D/CV
lilleyse Dec 22, 2018
8e94c7c
Update CHANGES.md
lilleyse Dec 22, 2018
65821fe
Fix CI
lilleyse Dec 22, 2018
8453779
Move depth update command after invert clsasification
lilleyse Jan 2, 2019
5e3a0cf
Merge branch 'polylines-3d-tiles' into polylines-on-3d-tiles
lilleyse Jan 2, 2019
9e7f30a
Move breaking changes section to the top
lilleyse Jan 2, 2019
c1000bf
Merge pull request #7434 from AnalyticalGraphicsInc/polylines-3d-tiles
bagnell Jan 2, 2019
29f5d93
Merge branch 'classification-fixes' into polylines-on-3d-tiles
lilleyse Jan 2, 2019
13b8285
Smaller polylines to speed up tests
lilleyse Jan 2, 2019
56b63d1
Wrap pollToPromise blocks
lilleyse Jan 2, 2019
2616eee
Remove unneeded shader checks
lilleyse Jan 2, 2019
3729e70
Update Sandcastle demo
lilleyse Jan 2, 2019
29e9146
Merge pull request #7437 from AnalyticalGraphicsInc/polylines-on-3d-t…
bagnell Jan 2, 2019
469ca01
Merge branch 'master' into classification-fixes
lilleyse Jan 3, 2019
4796014
Merge branch 'master' into classification-fixes
lilleyse Jan 3, 2019
290b531
Fix test
lilleyse Jan 3, 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
Prev Previous commit
Next Next commit
Smaller polylines to speed up tests
@lilleyse
lilleyse committed Jan 2, 2019
commit 13b82856110a35012e43f4947222c97aa6cf9b68
36 changes: 18 additions & 18 deletions Specs/DataSources/PolylineVisualizerSpec.js
View file
Original file line number Diff line number Diff line change
@@ -81,7 +81,7 @@ defineSuite([
var visualizer = new PolylineVisualizer(scene, objects);

var polyline = new PolylineGraphics();
polyline.positions = new ConstantProperty([Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 1.0)]);
polyline.positions = new ConstantProperty([Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 0.000001)]);
polyline.material = new ColorMaterialProperty();

var entity = new Entity();
@@ -120,7 +120,7 @@ defineSuite([
var visualizer = new PolylineVisualizer(scene, objects);

var polyline = new PolylineGraphics();
polyline.positions = new ConstantProperty([Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 1.0)]);
polyline.positions = new ConstantProperty([Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 0.000001)]);
polyline.material = new PolylineArrowMaterialProperty();

var entity = new Entity();
@@ -163,7 +163,7 @@ defineSuite([
var visualizer = new PolylineVisualizer(scene, objects);

var polyline = new PolylineGraphics();
polyline.positions = new ConstantProperty([Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 1.0)]);
polyline.positions = new ConstantProperty([Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 0.000001)]);
polyline.material = new ColorMaterialProperty();
polyline.clampToGround = new ConstantProperty(true);

@@ -203,7 +203,7 @@ defineSuite([
var visualizer = new PolylineVisualizer(scene, objects);

var polyline = new PolylineGraphics();
polyline.positions = new ConstantProperty([Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 1.0)]);
polyline.positions = new ConstantProperty([Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 0.000001)]);
polyline.material = new ColorMaterialProperty();
polyline.shadows = new ConstantProperty(shadows);

@@ -254,7 +254,7 @@ defineSuite([
var visualizer = new PolylineVisualizer(scene, objects);

var polyline = new PolylineGraphics();
polyline.positions = new ConstantProperty([Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 1.0)]);
polyline.positions = new ConstantProperty([Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 0.000001)]);
polyline.material = new ColorMaterialProperty();
polyline.depthFailMaterial = new ColorMaterialProperty();

@@ -296,7 +296,7 @@ defineSuite([
var visualizer = new PolylineVisualizer(scene, objects);

var polyline = new PolylineGraphics();
polyline.positions = new ConstantProperty([Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 1.0)]);
polyline.positions = new ConstantProperty([Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 0.000001)]);
polyline.material = new ColorMaterialProperty();
polyline.depthFailMaterial = new PolylineArrowMaterialProperty();

@@ -338,7 +338,7 @@ defineSuite([
var visualizer = new PolylineVisualizer(scene, objects);

var polyline = new PolylineGraphics();
polyline.positions = new ConstantProperty([Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 1.0)]);
polyline.positions = new ConstantProperty([Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 0.000001)]);
polyline.material = new PolylineArrowMaterialProperty();
polyline.depthFailMaterial = new PolylineArrowMaterialProperty();

@@ -380,7 +380,7 @@ defineSuite([
var visualizer = new PolylineVisualizer(scene, objects);

var polyline = new PolylineGraphics();
polyline.positions = new ConstantProperty([Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 1.0)]);
polyline.positions = new ConstantProperty([Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 0.000001)]);
polyline.material = new PolylineArrowMaterialProperty();
polyline.depthFailMaterial = new ColorMaterialProperty();

@@ -426,7 +426,7 @@ defineSuite([
var visualizer = new PolylineVisualizer(scene, objects);

var polyline = new PolylineGraphics();
polyline.positions = new ConstantProperty([Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 1.0)]);
polyline.positions = new ConstantProperty([Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 0.000001)]);
polyline.material = new ColorMaterialProperty();
polyline.classificationType = new ConstantProperty(classificationType);
polyline.clampToGround = true;
@@ -474,7 +474,7 @@ defineSuite([
var visualizer = new PolylineVisualizer(scene, objects);

var polyline = new PolylineGraphics();
polyline.positions = new ConstantProperty([Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 1.0)]);
polyline.positions = new ConstantProperty([Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 0.000001)]);
polyline.material = new ColorMaterialProperty();

var entity = new Entity();
@@ -527,7 +527,7 @@ defineSuite([

var polyline = new PolylineGraphics();
polyline.positions = new CallbackProperty(function() {
return [Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 1.0)];
return [Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 0.000001)];
}, false);
polyline.material = new ColorMaterialProperty();

@@ -574,7 +574,7 @@ defineSuite([
var visualizer = new PolylineVisualizer(scene, entityCollection);

var polyline = new PolylineGraphics();
polyline.positions = new ConstantProperty([Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 1.0)]);
polyline.positions = new ConstantProperty([Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 0.000001)]);
polyline.material = new PolylineArrowMaterialProperty();

var entity = new Entity();
@@ -632,7 +632,7 @@ defineSuite([
var entity = new Entity({
id : 'test',
polyline : {
positions: [Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 1.0)],
positions: [Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 0.000001)],
material: Color.ORANGE
}
});
@@ -650,7 +650,7 @@ defineSuite([
id : 'test',
position : Cartesian3.fromDegrees(0, 0, 0),
polyline : {
positions: [Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 1.0)],
positions: [Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 0.000001)],
material : Color.BLUE
}
});
@@ -690,7 +690,7 @@ defineSuite([

var entity = entities.add({
polyline : {
positions: [Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 1.0)],
positions: [Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 0.000001)],
material : new ColorMaterialProperty(createDynamicProperty(Color.BLUE))
}
});
@@ -732,7 +732,7 @@ defineSuite([
var entity = entities.add({
position : new Cartesian3(1234, 5678, 9101112),
polyline : {
positions: [Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 1.0)],
positions: [Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 0.000001)],
material : new PolylineArrowMaterialProperty(createDynamicProperty(Color.BLUE))
}
});
@@ -776,7 +776,7 @@ defineSuite([
var visualizer = new PolylineVisualizer(scene, objects);

var polyline = new PolylineGraphics();
polyline.positions = new ConstantProperty([Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 1.0)]);
polyline.positions = new ConstantProperty([Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 0.000001)]);
polyline.material = new ColorMaterialProperty();
polyline.clampToGround = new ConstantProperty(true);

@@ -824,7 +824,7 @@ defineSuite([

var blueColor = Color.BLUE.withAlpha(0.5);
var redColor = Color.RED.withAlpha(0.5);
var positions = [Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 1.0)];
var positions = [Cartesian3.fromDegrees(0.0, 0.0), Cartesian3.fromDegrees(0.0, 0.000001)];
entities.add({
polyline : {
positions : positions,