Commit Graph

15391 Commits

Author SHA1 Message Date
Éric Lemoine
336de4b1b1 Revert changes to the icon example
The changes were made for testing WebGL, and we now have specific examples for WebGL point.
2014-11-21 15:13:51 +01:00
Éric Lemoine
34953e8266 No need to mention WebGL in draw-feature example 2014-11-21 15:12:26 +01:00
Éric Lemoine
dae5bd53b7 Merge pull request #41 from elemoine/webgl-point-cleanup
[webgl-point] Use ol WebGL infrastructure in WebGL replay
2014-11-21 14:56:19 +01:00
gberaudo
a324f9805f Merge pull request #42 from gberaudo/webgl_immediate_fixes
[webgl-point] Webgl Immediate fixes
2014-11-21 14:43:12 +01:00
Guillaume Beraudo
fe74bd1b2c Add missing call to flush in webgl map renderer 2014-11-21 13:36:09 +01:00
Guillaume Beraudo
235f7c5bd1 Fix lack of @api doc in webgl Immediate 2014-11-21 13:35:20 +01:00
Éric Lemoine
fd9db053c0 Use ol WebGL infrastructure in WebGL replay 2014-11-21 11:39:47 +01:00
Tobias Sauerwein
ac24b615c3 Merge pull request #39 from tsauerwein/webgl-point-hit-detection-atlas
[webgl-point] Add hit-detection images of symbols to separate atlas
2014-11-21 11:37:48 +01:00
Éric Lemoine
44782c59a5 Merge pull request #40 from elemoine/webgl-point-cleanup
[webgl-point] Remove unused WebGL related code
2014-11-21 11:37:21 +01:00
Éric Lemoine
1e12e7ca90 Remove unused WebGL related code 2014-11-21 10:51:00 +01:00
tsauerwein
fb8af71f25 Use goog.isNull and goog.isDef 2014-11-21 10:42:06 +01:00
Tobias Sauerwein
283d878177 Merge pull request #36 from tsauerwein/webgl-point-has-stable
Mark ol.has.WEBGL_MAX_TEXTURE_SIZE as API
2014-11-21 10:33:18 +01:00
Éric Lemoine
a665b76f8f Merge pull request #38 from elemoine/webgl-point-uint
Fix assert in WebGL replay
2014-11-21 10:20:44 +01:00
tsauerwein
8fcde092c7 Set the default of WEBGL_MAX_TEXTURE_SIZE to undefined
By doing so the examples will also work if WebGL is not supported.
2014-11-21 09:54:55 +01:00
tsauerwein
40c33a21eb Mark ol.has.WEBGL_MAX_TEXTURE_SIZE as API 2014-11-21 09:52:09 +01:00
tsauerwein
ab42965aa2 Add hit-detection image to atlas (RegularShape) 2014-11-21 09:41:38 +01:00
tsauerwein
4132505313 Add hit-detection image to atlas (Circle) 2014-11-21 09:41:10 +01:00
tsauerwein
97f8e4ac8d Keep separate atlas for hit-detection images 2014-11-21 09:40:22 +01:00
tsauerwein
82ef80cf60 Add imageSize and origin for hit-detection image 2014-11-21 09:39:38 +01:00
Éric Lemoine
05f71383f9 Fix assert in WebGL replay 2014-11-21 09:33:45 +01:00
Éric Lemoine
ee54d21b89 Merge pull request #37 from elemoine/webgl-point-uint
[webgl-point] Use OES_element_index_uint when available
2014-11-20 17:08:16 +01:00
Éric Lemoine
7c88329354 Use 50000 features in the WebGL vector examples 2014-11-20 16:39:25 +01:00
Éric Lemoine
2f7c97f25a Use OES_element_index_uint when available 2014-11-20 16:39:25 +01:00
gberaudo
3af2257345 Merge pull request #22 from gberaudo/webgl_immediate_point
[webgl-point] Webgl immediate implementation using a replay group
2014-11-20 14:01:08 +01:00
Guillaume Beraudo
7d01946fef Removing webgl Immediate delegation code for drawing text 2014-11-20 13:53:00 +01:00
Guillaume Beraudo
257784e277 More lenient webgl Immediate drawing of a feature.
Remove assert to handle drawing features with supported geometries.
2014-11-20 13:53:00 +01:00
Guillaume Beraudo
f1402522b5 More lenient Immediate geometry collection rendering
Render geometry collection elements with a valid renderer inspite of
throwing an assertion error. Allows support of hierarchies of points.
2014-11-20 13:53:00 +01:00
Guillaume Beraudo
20ceae2655 Webgl immediate implementation for points
Internally uses a replay group to share code.

Modifies the dynamic data example to use PointGeometry
and Feature in addition to MultiPoint.
2014-11-20 13:53:00 +01:00
Tobias Sauerwein
9681ec3e10 Merge pull request #35 from tsauerwein/webgl-point-fix-examples
Fix examples (minor)
2014-11-20 12:01:22 +01:00
Tobias Sauerwein
d5ffd8abac Merge pull request #34 from camptocamp/webgl-point-texture-per-image
Make sure only one texture is created per image
2014-11-20 12:01:11 +01:00
tsauerwein
d73e183c89 Fix examples
The very last style was not used.
2014-11-20 11:50:46 +01:00
tsauerwein
d12db0419c Make sure only one texture is created per image 2014-11-20 11:39:25 +01:00
Tobias Sauerwein
c564a0963c Merge pull request #33 from tsauerwein/webgl-point-symbol-atlas
[webgl-point] Use the atlas manager for symbols [WIP]
2014-11-20 09:50:03 +01:00
tsauerwein
327763cc82 Add stars to example 2014-11-13 12:04:51 +01:00
tsauerwein
f07e59d63f Add regular shape example 2014-11-13 11:52:35 +01:00
tsauerwein
e9e76954b2 Integrate atlas manager into RegularShape 2014-11-13 11:48:23 +01:00
tsauerwein
7593a18a19 Add atlas manager to RegularShapeOptions 2014-11-13 10:53:03 +01:00
tsauerwein
ea65f65b37 Implement getChecksum for RegularShape 2014-11-13 10:50:07 +01:00
tsauerwein
7e9dd65f8b Add example for symbols in an atlas 2014-11-13 10:24:28 +01:00
tsauerwein
62e9d259b2 Fix @type annotation
A description for @type annotation emits a warning.
2014-11-12 17:22:27 +01:00
tsauerwein
b3b7579f84 Use atlas manager for circle style 2014-11-12 17:22:27 +01:00
tsauerwein
ffced21893 Add atlas manager to CircleOptions 2014-11-12 17:22:27 +01:00
Tobias Sauerwein
2a5fffaee4 Merge pull request #32 from tsauerwein/webgl-point-offset
[webgl-point] Fix call to drawElements
2014-11-12 17:21:21 +01:00
tsauerwein
41887e660b Fix call to drawElements
The offset must be given in bytes.
2014-11-12 16:29:46 +01:00
Éric Lemoine
01bc02214c Merge pull request #31 from elemoine/webgl-point-refactoring
[webgl-point] Minor refactoring to WebGL image replay func
2014-11-10 18:21:42 +01:00
Éric Lemoine
46e436b599 Minor refactoring to WebGL image replay func 2014-11-10 17:19:31 +01:00
Éric Lemoine
23a24973eb Merge pull request #30 from elemoine/webgl-point-delete
[webgl-point] Add ol.renderer.webgl.VectorLayer#disposeInternal
2014-11-10 17:18:28 +01:00
Éric Lemoine
c8e22bdb44 Merge pull request #29 from elemoine/webgl-point-merge
[webgl-point] Merge openlayers:master into the branch
2014-11-10 17:18:04 +01:00
Éric Lemoine
d9a4482393 Add ol.renderer.webgl.VectorLayer#disposeInternal
Implement disposeInternal to free WebGL resources (deleteBuffer and deleteTexture).
2014-11-10 16:52:32 +01:00
Éric Lemoine
501e7456c0 Merge remote-tracking branch 'upstream/master' into webgl-point-merge 2014-11-10 15:40:03 +01:00