[Opengeoscience-developers] OpenGeoscience branch, next, updated. 425ff270d498d26d80ad41c1cfab2cc4fc4eb35f

[Aashish Chaudhary]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "OpenGeoscience".

The branch, next has been updated
       via  425ff270d498d26d80ad41c1cfab2cc4fc4eb35f (commit)
       via  f03fb3b7139dded957ee367cc8b00c4f77bc82ff (commit)
       via  4253231431a692bd5e5e1635be70e140b6fea505 (commit)
       via  a40f926a9f6e357dda3cb72c69ab07ce69ba2604 (commit)
       via  fff91bc7d7d02c2233edaac16f852d6631bae43e (commit)
       via  945c8c5fc3e83902dbc8d0fc740fbb82dbcf06a2 (commit)
       via  e05e591a0e4492a2f6172cd1a0e51d9b06f84a53 (commit)
       via  2b17a8c6604b6939e1be8a742f9972f92cc3f5c5 (commit)
       via  33cadc7eef79174bc92165ba1565024d25dfacdf (commit)
       via  423d00388f0bb7c4cc3a39f806e14c15a056e7a2 (commit)
       via  eb05fd6e14c0312acffc117513ea2391a0558fc6 (commit)
       via  71874d48a0c8e00715bb2a77b793d3707d491958 (commit)
       via  baf5a9386beaf64d9ebe8b48ab8661803442b361 (commit)
       via  6d43f0ee489e547220c60fa9179af29799903b46 (commit)
       via  72076e4c513276cf2109c612ccb643f069d65d1d (commit)
       via  7373e64e6260f5e6e81c6ea1ff1c5b835310993b (commit)
       via  f928de98680bb8bb2e6d120caab3b89f9be13d17 (commit)
       via  e7045aade4895828ad58254d0527158b63fb202a (commit)
       via  4aa9de7df070f136d8dd780980a6ce78b61ed16e (commit)
       via  14f279bf35220315b392c0d43115a0736c398f39 (commit)
      from  b2bae288df4fd1672713786ef8a269286d916ac1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://public.kitware.com/gitweb?p=OpenGeoscience/geoweb.git;a=commitdiff;h=425ff270d498d26d80ad41c1cfab2cc4fc4eb35f
commit 425ff270d498d26d80ad41c1cfab2cc4fc4eb35f
Merge: b2bae28 f03fb3b
Author: Aashish Chaudhary <aashish.chaudhary at kitware.com>
Date:   Wed Jul 31 01:03:49 2013 -0400

    Merge remote-tracking branch 'origin/75_basic_legend' into next
    
    * origin/75_basic_legend:
      Added note update legend functionality
      For now skip transparency on legend
      Added API on legend creation and update
      Removed un-necessary code
      Improving legend API
      Added axis label draw feature
      Improved API a bit
      Fixed errors detected by jslint
      Fixed some more styling
      Using argument text size
      Fixed map tiles texture bleeding through the labels
      Fixing style
      Update logic for color and color legend construction / updates
      Use only one 2d canvas for text rendering
      Added and used texture shader for RGBA textures
      Use line strip for geojson line string
      Implementing rendering of text using WebGL and canvas
      Implementing ability to draw ticks
      Implementing basic infrastructure for legend
    
    Conflicts:
    	web/apps/archive/archive.js
    	web/lib/geo/layer.js
    	web/lib/geo/map.js

 CMakeLists.txt                    |    2 +
 web/apps/archive/archive.js       |   16 +-
 web/apps/archive/index.html       |    1 -
 web/lib/geo/archiveLayerSource.js |   34 ++-
 web/lib/geo/feature.js            |  176 ++++++---
 web/lib/geo/featureLayer.js       |  113 +++++-
 web/lib/geo/layer.js              |  154 +++++++-
 web/lib/geo/layerSource.js        |   14 +-
 web/lib/geo/map.js                |   31 +-
 web/lib/vgl/actor.js              |   14 +-
 web/lib/vgl/boundingObject.js     |    5 +
 web/lib/vgl/geojsonReader.js      |   53 ++-
 web/lib/vgl/geomData.js           |   34 ++-
 web/lib/vgl/legend.js             |   31 ++
 web/lib/vgl/lineSource.js         |  114 +++++
 web/lib/vgl/material.js           |   37 ++-
 web/lib/vgl/materialAttribute.js  |    2 +-
 web/lib/vgl/renderer.js           |   19 +-
 web/lib/vgl/texture.js            |   31 ++-
 web/lib/vgl/utils.js              |  832 ++++++++++++++++++++++++++++---------
 web/lib/vgl/vertexAttribute.js    |    8 +-
 21 files changed, 1379 insertions(+), 342 deletions(-)

-----------------------------------------------------------------------

Summary of changes:
 CMakeLists.txt                    |    2 +
 web/apps/archive/archive.js       |   16 +-
 web/apps/archive/index.html       |    1 -
 web/lib/geo/archiveLayerSource.js |   34 ++-
 web/lib/geo/feature.js            |  176 ++++++---
 web/lib/geo/featureLayer.js       |  113 +++++-
 web/lib/geo/layer.js              |  154 +++++++-
 web/lib/geo/layerSource.js        |   14 +-
 web/lib/geo/map.js                |   31 +-
 web/lib/vgl/actor.js              |   14 +-
 web/lib/vgl/boundingObject.js     |    5 +
 web/lib/vgl/geojsonReader.js      |   53 ++-
 web/lib/vgl/geomData.js           |   34 ++-
 web/lib/vgl/legend.js             |   31 ++
 web/lib/vgl/lineSource.js         |  114 +++++
 web/lib/vgl/material.js           |   37 ++-
 web/lib/vgl/materialAttribute.js  |    2 +-
 web/lib/vgl/renderer.js           |   19 +-
 web/lib/vgl/texture.js            |   31 ++-
 web/lib/vgl/utils.js              |  832 ++++++++++++++++++++++++++++---------
 web/lib/vgl/vertexAttribute.js    |    8 +-
 21 files changed, 1379 insertions(+), 342 deletions(-)
 create mode 100644 web/lib/vgl/legend.js
 create mode 100644 web/lib/vgl/lineSource.js


hooks/post-receive
-- 
OpenGeoscience