[Opengeoscience-developers] OpenGeoscience branch, next, updated. ca8857cfe314ae7a9d426c2f1eeef0ddc95e79a6
Aashish Chaudhary
aashish.chaudhary at kitware.com
Wed Mar 13 23:15:04 EDT 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 ca8857cfe314ae7a9d426c2f1eeef0ddc95e79a6 (commit)
via 45115595acd85298db449187591138b9a20056b6 (commit)
via 1192e2ef400de33b780d55832e2553b46912f8a3 (commit)
via 98236d7d4fc93f725f4d884c1470da3028382a2e (commit)
via 6a1d7a91ad8876a178f40d975dce62de2dbe248d (commit)
via 5fa82e98f9a36f3d6873b3b91f0f0472e9d0be7d (commit)
via 8068123c2c2efcd115ee3d74724f2bbf71aa4f93 (commit)
via 0e7b08f2d0c6aefa742b7d07cb0bf78cb122d357 (commit)
via 8e784826985b0b5888d49154a67932b20d4ece1d (commit)
via 3170906551378be6abd98829eabaf7611df92881 (commit)
via c9e99eab858608073b2a47325b6cd41630dcb032 (commit)
via 91fc874eaf1faa172b41e0d0611ca09ecf7b6ab1 (commit)
via 54d962cf03d79e0450f43da5018a43dddc45993c (commit)
from b090a456b9b224880129d4c5bc7e3e92b2a8a428 (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=ca8857cfe314ae7a9d426c2f1eeef0ddc95e79a6
commit ca8857cfe314ae7a9d426c2f1eeef0ddc95e79a6
Merge: b090a45 4511559
Author: Aashish Chaudhary <aashish.chaudhary at kitware.com>
Date: Wed Mar 13 23:14:53 2013 -0400
Merge remote-tracking branch 'origin/m14001_cleanup_map' into next
* origin/m14001_cleanup_map:
Some more clean up
Some more documentation fixes
Fixing documentation
Updated API to use events
Style and documentation fixes
Made the interface nicer
Changed default background color to white
Changed default background color to white
Fixing issues
First pass on adding render window and viewer for the vgl and map
Removed current copyright
Conflicts:
CMakeLists.txt
CMakeLists.txt | 28 +-
web/index.html | 20 +-
web/lib/app.js | 34 +-
web/lib/core/init.js | 20 -
web/lib/core/timestamp.js | 25 -
web/lib/geo/command.js | 26 +
web/lib/geo/feature.js | 47 +-
web/lib/geo/init.js | 22 +-
web/lib/geo/latlng.js | 37 +-
web/lib/geo/layer.js | 109 +-
web/lib/geo/map.js | 239 +--
web/lib/geo/mapInteractorStyle.js | 151 ++
web/lib/gl-matrix.js | 3456 -----------------------------------
web/lib/glUtils.js | 192 --
web/lib/init.js | 49 -
web/lib/jsHelper.js | 40 -
web/lib/sylvester.js | 1 -
web/lib/vgl/actor.js | 120 +-
web/lib/vgl/blend.js | 75 +-
web/lib/vgl/boundingObject.js | 43 +-
web/lib/vgl/camera.js | 132 +-
web/lib/vgl/command.js | 48 +
web/lib/vgl/geomData.js | 250 +--
web/lib/vgl/groupNode.js | 56 +-
web/lib/vgl/init.js | 59 +-
web/lib/vgl/interactorStyle.js | 63 +
web/lib/vgl/mapper.js | 52 +-
web/lib/vgl/material.js | 33 +-
web/lib/vgl/materialAttribute.js | 56 +-
web/lib/vgl/modelViewMatrixStack.js | 23 +-
web/lib/vgl/node.js | 49 +-
web/lib/vgl/object.js | 42 +-
web/lib/vgl/planeSource.js | 39 +-
web/lib/vgl/pointSource.js | 37 +-
web/lib/vgl/renderWindow.js | 238 +++
web/lib/vgl/renderer.js | 107 +-
web/lib/vgl/shader.js | 35 +-
web/lib/vgl/shaderProgram.js | 49 +-
web/lib/vgl/source.js | 29 +-
web/lib/vgl/texture.js | 37 +-
web/lib/vgl/timestamp.js | 25 +
web/lib/vgl/uniform.js | 25 +-
web/lib/vgl/utils.js | 94 +-
web/lib/vgl/vertexAttribute.js | 61 +-
web/lib/vgl/viewer.js | 125 ++
web/lib/vgl/visitor.js | 55 +-
46 files changed, 1459 insertions(+), 5094 deletions(-)
-----------------------------------------------------------------------
Summary of changes:
CMakeLists.txt | 28 +-
web/index.html | 20 +-
web/lib/app.js | 34 +-
web/lib/core/init.js | 20 -
web/lib/core/timestamp.js | 25 -
web/lib/geo/command.js | 26 +
web/lib/geo/feature.js | 47 +-
web/lib/geo/init.js | 22 +-
web/lib/geo/latlng.js | 37 +-
web/lib/geo/layer.js | 109 +-
web/lib/geo/map.js | 239 +--
web/lib/geo/mapInteractorStyle.js | 151 ++
web/lib/gl-matrix.js | 3456 -----------------------------------
web/lib/glUtils.js | 192 --
web/lib/init.js | 49 -
web/lib/jsHelper.js | 40 -
web/lib/sylvester.js | 1 -
web/lib/vgl/actor.js | 120 +-
web/lib/vgl/blend.js | 75 +-
web/lib/vgl/boundingObject.js | 43 +-
web/lib/vgl/camera.js | 132 +-
web/lib/vgl/command.js | 48 +
web/lib/vgl/geomData.js | 250 +--
web/lib/vgl/groupNode.js | 56 +-
web/lib/vgl/init.js | 59 +-
web/lib/vgl/interactorStyle.js | 63 +
web/lib/vgl/mapper.js | 52 +-
web/lib/vgl/material.js | 33 +-
web/lib/vgl/materialAttribute.js | 56 +-
web/lib/vgl/modelViewMatrixStack.js | 23 +-
web/lib/vgl/node.js | 49 +-
web/lib/vgl/object.js | 42 +-
web/lib/vgl/planeSource.js | 39 +-
web/lib/vgl/pointSource.js | 37 +-
web/lib/vgl/renderWindow.js | 238 +++
web/lib/vgl/renderer.js | 107 +-
web/lib/vgl/shader.js | 35 +-
web/lib/vgl/shaderProgram.js | 49 +-
web/lib/vgl/source.js | 29 +-
web/lib/vgl/texture.js | 37 +-
web/lib/vgl/timestamp.js | 25 +
web/lib/vgl/uniform.js | 25 +-
web/lib/vgl/utils.js | 94 +-
web/lib/vgl/vertexAttribute.js | 61 +-
web/lib/vgl/viewer.js | 125 ++
web/lib/vgl/visitor.js | 55 +-
46 files changed, 1459 insertions(+), 5094 deletions(-)
delete mode 100644 web/lib/core/init.js
delete mode 100644 web/lib/core/timestamp.js
create mode 100644 web/lib/geo/command.js
create mode 100644 web/lib/geo/mapInteractorStyle.js
delete mode 100644 web/lib/gl-matrix.js
delete mode 100644 web/lib/glUtils.js
delete mode 100644 web/lib/init.js
delete mode 100644 web/lib/jsHelper.js
delete mode 100644 web/lib/sylvester.js
create mode 100644 web/lib/vgl/command.js
create mode 100644 web/lib/vgl/interactorStyle.js
create mode 100644 web/lib/vgl/renderWindow.js
create mode 100644 web/lib/vgl/timestamp.js
create mode 100644 web/lib/vgl/viewer.js
hooks/post-receive
--
OpenGeoscience
More information about the Opengeoscience-developers
mailing list