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

Polygons on terrain #2865

Merged
merged 82 commits into from
Aug 21, 2015
Merged

Polygons on terrain #2865

Changes from 1 commit
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
c6c2d03
Ground primitive WIP.
bagnell Feb 21, 2015
11770c1
Clamp positions to near plane. Shadow volume sides that are entirely …
bagnell Feb 24, 2015
c1c9c65
Merge branch 'globe-depth' into ground-primitive
bagnell Mar 3, 2015
1b42df4
Merge branch 'globe-depth' into ground-primitive
bagnell Mar 11, 2015
ba6026a
Merge branch 'globe-depth' into ground-primitive
bagnell Mar 18, 2015
fe5fab1
Declare commands and properly release shaders.
bagnell Mar 18, 2015
5d408bf
Update CHANGES.md.
bagnell Mar 18, 2015
5496e4b
Merge branch 'globe-depth' into ground-primitive
bagnell Mar 24, 2015
4d72baf
Clip polygon to the near plane of the first frustum WIP. Added debug …
bagnell Mar 24, 2015
36b6772
More ground polygon WIP. Only extrude vertices in vertex shader. Vert…
bagnell Mar 24, 2015
0790da0
Fix blinking polygon by slightly offsetting intersection point from t…
bagnell Mar 24, 2015
f0c8e24
Fix multi-frustum artifact on ground polygons volume.
bagnell Mar 25, 2015
94e1336
Clean up intersection function to make it more clear and add comments.
bagnell Mar 25, 2015
3a96b61
Some shader clean up and fixing a volume artifact WIP.
bagnell Mar 27, 2015
60ab053
Remove ground polygon texture coordinates.
bagnell Apr 1, 2015
0230cb0
Merge branch 'globe-depth' into ground-primitive
bagnell Apr 1, 2015
f1d5831
Add ground polygon development Sandcastle example.
bagnell Apr 1, 2015
01d4d6a
Use the same normal for both extruded and non-extruded positions. Add…
bagnell Apr 8, 2015
d051c08
Fix artifact where more than one frustum was drawing at the far plane…
bagnell Apr 9, 2015
94552de
Merge branch 'master' into ground-primitive
bagnell Jul 1, 2015
063a0ac
Merge remote-tracking branch 'origin' into ground-primitive
bagnell Jul 8, 2015
9b54673
Fix looking up at terrain when inside the shadow volume.
bagnell Jul 9, 2015
239cd1c
Remove code for culled lines from the function to clip the line again…
bagnell Jul 9, 2015
a7eb9b6
Avoid computing eye coordinates multiple times.
bagnell Jul 9, 2015
f8877cd
Fix shadow volumes by using a different technique.
bagnell Jul 15, 2015
c344aa2
Move to more general ground primitive WIP.
bagnell Jul 15, 2015
e9affe0
Remove ground polygon for more general ground primitive.
bagnell Jul 15, 2015
fdd5e5b
Merge branch 'master' into ground-primitive
bagnell Jul 15, 2015
23f6700
Add Columbus view support and per instance attribute support.
bagnell Jul 15, 2015
ff0a67a
Add commands for z-pass algorithm.
bagnell Jul 16, 2015
50bf334
Add support for more geometry that can be clamped to the ground. Add …
bagnell Jul 17, 2015
face14c
Compute shadow volume height based on granularity. Overlap frustums w…
bagnell Jul 22, 2015
ea1fd7b
Merge branch 'master' into ground-primitive
bagnell Jul 22, 2015
68c49f8
Remove z-pass optimization to fix multi-frustum artifact.
bagnell Jul 23, 2015
d55ff80
Fix rectangle geometry surface volume.
bagnell Jul 23, 2015
2d1894c
Clean up primitive shadow volume creation.
bagnell Jul 23, 2015
3e10cf5
Add picking support to ground primitive and remove model matrix option.
bagnell Jul 23, 2015
6f546c6
Merge branch 'master' into ground-primitive
bagnell Jul 24, 2015
c99bd57
Reapply change from merge to reorganized code.
bagnell Jul 24, 2015
84ff66e
Merge branch 'globe-pick' into ground-primitive
bagnell Jul 24, 2015
3269056
Use a depth/stencil renderbuffer with the picking fbo.
bagnell Jul 24, 2015
6ab9532
Merge branch 'master' into ground-primitive
bagnell Jul 27, 2015
277930f
Merge branch 'depth-plane' into ground-primitive
bagnell Jul 27, 2015
164dbc8
Add doc and properties forwarded to the primitive.
bagnell Jul 28, 2015
9ef18a0
Clean up ground primitive example.
bagnell Jul 28, 2015
5c9e945
Rename _createShadowVolume by removing the underscore and making it p…
bagnell Jul 28, 2015
49d3769
Merge branch 'master' into ground-primitive
bagnell Jul 28, 2015
198f857
Remove #ifdefs from shader checking for GL_EXT_frag_depth. The shader…
bagnell Jul 28, 2015
282463f
Porting Primitive tests for GroundPrimitive WIP.
bagnell Jul 29, 2015
256c47b
Add remaining tests.
bagnell Jul 29, 2015
cd15a4e
Update doc.
bagnell Jul 29, 2015
ff9a863
Update CHANGES.md.
bagnell Jul 29, 2015
deaf939
Merge branch 'master' into ground-primitive
bagnell Jul 31, 2015
f503bd0
Refactor Primitive and GroundPrimitive updates.
bagnell Aug 17, 2015
1b7d5c2
Merge branch 'master' into ground-primitive
bagnell Aug 17, 2015
7a3417e
Add hooks to Primitive to override render state, shader, and command …
bagnell Aug 17, 2015
ea855bb
The GroundPrimitive creates more commands that Primitive. Properly sy…
bagnell Aug 17, 2015
71f0bc9
Add prototype versions of distanceSquaredTo and computePlaneDistances…
bagnell Aug 18, 2015
001fdf6
Add OrientedBoundingBox.distanceSquaredTo.
bagnell Aug 18, 2015
3043c44
Add OrientedBoundingBox.computePlaneDistances.
bagnell Aug 18, 2015
e4587c1
Add an isOccluded function to the prototypes of BoundingSphere and Or…
bagnell Aug 18, 2015
71193a8
Add support for both bounding spheres and boxes to Scene.
bagnell Aug 18, 2015
21d0118
Add hook to primitive for creating custom bounding volumes for geometry.
bagnell Aug 18, 2015
7c23324
Remove unnecessary vector multiplies and magnitudes when getting dist…
bagnell Aug 18, 2015
a4e8fa9
Use OBBs as bounding volumes for ground primitives.
bagnell Aug 18, 2015
6517e2d
Modify debugShowBoundingVolume to work with OBBs.
bagnell Aug 18, 2015
f10fecc
Merge branch 'master' into ground-primitive
bagnell Aug 19, 2015
3d9ced1
Fix ground primitive bounding volumes when not in 3D.
bagnell Aug 19, 2015
e301a3c
Change geometryInstances to geometryInstance since batching is not su…
bagnell Aug 19, 2015
e9caa53
Fix tests.
bagnell Aug 19, 2015
8155c35
Test optimization from review.
bagnell Aug 19, 2015
a18e6ab
Add tests for new BoundingSphere and OrientedBoundingBox functions.
bagnell Aug 19, 2015
b50d97a
Use scene instead of context for ground primitive rendering tests.
bagnell Aug 20, 2015
cc60873
Fix test.
bagnell Aug 20, 2015
3a6ee56
Enable picking ground primitives when depthTestAgainstTerrain is false.
bagnell Aug 20, 2015
2521859
Merge branch 'master' into ground-primitive
bagnell Aug 20, 2015
c320e39
Merge branch 'master' into ground-primitive
bagnell Aug 20, 2015
79aed81
Update CHANGES.ms.
bagnell Aug 21, 2015
870e68a
Merge branch 'master' into ground-primitive
bagnell Aug 21, 2015
d76b729
Fix after merge.
bagnell Aug 21, 2015
9f6664d
Fix IE tests.
bagnell Aug 21, 2015
b9856c0
Add GroundPrimitive.isSupported.
bagnell Aug 21, 2015
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
Merge branch 'master' into ground-primitive 
Conflicts:
	CHANGES.md
  • Loading branch information
@bagnell
bagnell committed Jul 31, 2015
commit deaf93992edfeef8cb7258f89998eaea93e39b36
5 changes: 0 additions & 5 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,6 @@ Change Log
* Deprecated
*
* Added support for `GroundPrimitive` which works much like `Primitive` but it drapes the geometry over terrain. Valid geometries that can be draped on terrain are `CircleGeometry`, `CorridorGeometry`, `EllipseGeometry`, `PolygonGeometry`, and `RectangleGeometry`.
* Fixes Cesium.js failing to parse in IE 8 and 9. While Cesium doesn't work in IE versions less than 11, but this allows for more graceful error handling.
* Fix calling `Scene.pickPosition` after calling `Scene.drillPick`. [#2813](https://github.com/AnalyticalGraphicsInc/cesium/issues/2813)
* Fixed a bug that caused `Camera.positionCartographic` to be incorrect. [#2838](https://github.com/AnalyticalGraphicsInc/cesium/issues/2838)
* Make `ArcGisMapServerImageryprovider` issue `pickFeatures` requests via a proxy if one is specified.
* Fixed incorrect texture coordinates for `WallGeometry` [#2872](https://github.com/AnalyticalGraphicsInc/cesium/issues/2872)
* Added `maximumHeight` option to `Viewer.flyTo`. [#2868](https://github.com/AnalyticalGraphicsInc/cesium/issues/2868)
* Added picking support to `UrlTemplateImageryProvider`.
* Added ArcGIS token-based authentication support to `ArcGisMapServerImageryProvider`.
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.