[Opengeoscience-developers] OpenGeoscience branch, next, updated. 3ea93c2bb731f4e2937d027e18fe1ece356f61f1
Aashish Chaudhary
aashish.chaudhary at kitware.com
Fri Mar 8 20:13:39 EST 2013
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 3ea93c2bb731f4e2937d027e18fe1ece356f61f1 (commit)
via 14524fc8367433bdcedaf90870151632c28794bd (commit)
via c75f17b57266558bc96568261f570a5785ec52a2 (commit)
via 5a6b316020debc3d527f0bf3b6f2af5f9f629463 (commit)
via a8c603785b92b733dc1715189f64be62fb251e2c (commit)
via 7604fc3021c5177496dd4951cda3a87205037d97 (commit)
via 4eb71770b5ea922652949c693e9b90fbe58e87c7 (commit)
via e11d01da3ed6603af4bb1265355b37aaeed880c8 (commit)
via 21d8020a06413710f3ed68a59c9cbbb3637c7bf9 (commit)
via b180acc90f65a7c224bac606c6dfdd00b4590de9 (commit)
via cb31e4223f1c80e69b4cc874445a75fdcff60d97 (commit)
via b216c6223dfee9e33b5f35d8871d85053a37c472 (commit)
via 97abc95b4f87db9fc6be96c13be030d158d68031 (commit)
via ba062ae8f8d12d534b38c026a782944a5a70560d (commit)
via a6d84fe4108354a73db5f3d70a99fc372b29a91e (commit)
via e593d85de5d8027f5efba07be0d4cebdf9e3a0f6 (commit)
via dd6664ee5f3189ea98ba8d48ba0f7feab6073fff (commit)
from 6bbe28ddd4a0ec96d96e23d8c577fcc902c577ac (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/opengeoscience.git;a=commitdiff;h=3ea93c2bb731f4e2937d027e18fe1ece356f61f1
commit 3ea93c2bb731f4e2937d027e18fe1ece356f61f1
Merge: 6bbe28d 14524fc
Author: Aashish Chaudhary <aashish.chaudhary at kitware.com>
AuthorDate: Fri Mar 8 20:12:58 2013 -0500
Commit: Aashish Chaudhary <aashish.chaudhary at kitware.com>
CommitDate: Fri Mar 8 20:12:58 2013 -0500
Merge remote-tracking branch 'origin/add_point_source' into next
* origin/add_point_source:
Removed data directory
Final fix for map image not showing up sometimes
Fixed map image not showing up sometimes
Added API to set solid color of the geometry
Using helper function to create material
Using point sprites for the dots
Do not use texture coordinates for the geometry shader
Work in progress to clean up the mapper
Optimize the code a bit
Got the cities to show up on the map
Got the points to show up
Adding high level api for drawing points
Work in progress to add point source
Removed experimental code
Work in progress to add point source class
Work in progress to add point source class
-----------------------------------------------------------------------
Summary of changes:
CMakeLists.txt | 2 +
data/tests/lines.json | 20 -
experimental/cherrypy/README.txt | 3 -
experimental/cherrypy/html/index.html | 45 -
experimental/cherrypy/js/jquery.min.js | 2 -
experimental/cherrypy/test01.py | 35 -
experimental/d3/index.html | 76 -
experimental/d3/unemployment.tsv | 3219 -----------------------
experimental/d3/us-counties.json | 3186 -----------------------
experimental/d3/us-states.json | 54 -
experimental/d3/us-test.json | 3 -
experimental/webgl/app.js | 463 ----
experimental/webgl/gl-matrix.js | 3456 -------------------------
experimental/webgl/glUtils.js | 193 --
experimental/webgl/index.html | 15 -
experimental/webgl/sylvester.js | 1 -
experimental/webgl/vesCamera.js | 186 --
experimental/webgl/vesModelViewMatrixStack.js | 22 -
web/lib/app.js | 58 +-
web/lib/geo/feature.js | 87 +-
web/lib/geo/map.js | 23 +-
web/lib/vgl/geomData.js | 370 ++--
web/lib/vgl/mapper.js | 77 +-
web/lib/vgl/planeSource.js | 24 +-
web/lib/vgl/pointSource.js | 135 +
web/lib/vgl/shader.js | 8 +-
web/lib/vgl/texture.js | 57 +-
web/lib/vgl/uniform.js | 42 +-
web/lib/vgl/utils.js | 320 ++-
29 files changed, 824 insertions(+), 11358 deletions(-)
delete mode 100644 data/tests/lines.json
delete mode 100644 experimental/cherrypy/README.txt
delete mode 100644 experimental/cherrypy/html/index.html
delete mode 100644 experimental/cherrypy/js/jquery.min.js
delete mode 100644 experimental/cherrypy/test01.py
delete mode 100644 experimental/d3/index.html
delete mode 100644 experimental/d3/unemployment.tsv
delete mode 100644 experimental/d3/us-counties.json
delete mode 100644 experimental/d3/us-states.json
delete mode 100644 experimental/d3/us-test.json
delete mode 100644 experimental/webgl/app.js
delete mode 100644 experimental/webgl/gl-matrix.js
delete mode 100644 experimental/webgl/glUtils.js
delete mode 100644 experimental/webgl/index.html
delete mode 100644 experimental/webgl/sylvester.js
delete mode 100644 experimental/webgl/vesCamera.js
delete mode 100644 experimental/webgl/vesModelViewMatrixStack.js
create mode 100644 web/lib/vgl/pointSource.js
hooks/post-receive
--
OpenGeoscience
More information about the Opengeoscience-developers
mailing list