[Opengeoscience-developers] OpenGeoscience branch, add_point_source, updated. e11d01da3ed6603af4bb1265355b37aaeed880c8

[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, add_point_source has been updated
       via  e11d01da3ed6603af4bb1265355b37aaeed880c8 (commit)
      from  21d8020a06413710f3ed68a59c9cbbb3637c7bf9 (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=e11d01da3ed6603af4bb1265355b37aaeed880c8
commit e11d01da3ed6603af4bb1265355b37aaeed880c8
Author:     Aashish Chaudhary <aashish.chaudhary at kitware.com>
AuthorDate: Thu Mar 7 17:07:11 2013 -0500
Commit:     Aashish Chaudhary <aashish.chaudhary at kitware.com>
CommitDate: Thu Mar 7 17:07:11 2013 -0500

    Do not use texture coordinates for the geometry shader

diff --git a/web/lib/app.js b/web/lib/app.js
index 98a25bd..23d2491 100644
--- a/web/lib/app.js
+++ b/web/lib/app.js
@@ -110,7 +110,5 @@ function processCSVData(csvdata) {
     var row = lines[i].split(',');
     table.push(row);
   }
-
-  console.log(table[0][0]);
   return table;
 }
diff --git a/web/lib/vgl/utils.js b/web/lib/vgl/utils.js
index 9cb4ae5..8be8c75 100644
--- a/web/lib/vgl/utils.js
+++ b/web/lib/vgl/utils.js
@@ -109,7 +109,6 @@ vglModule.utils.createTextureVertexShader = function(context) {
 vglModule.utils.createVertexShader = function(context) {
   var vertexShaderSource = [
                             'attribute vec3 vertexPosition;',
-                            'attribute vec3 textureCoord;',
                             'attribute vec3 vertexColor;',
                             'uniform float pointSize;',
                             'uniform mat4 modelViewMatrix;',
@@ -120,7 +119,6 @@ vglModule.utils.createVertexShader = function(context) {
                             '{',
                             'gl_PointSize = pointSize;',
                             'gl_Position = projectionMatrix * modelViewMatrix * vec4(vertexPosition, 1.0);',
-                            ' iTextureCoord = textureCoord;',
                             ' iVertexColor = vertexColor;', '}' ].join('\n');
 
   var shader = new vglModule.shader(gl.VERTEX_SHADER);
@@ -137,13 +135,13 @@ vglModule.utils.createTextureMaterial = function() {
   var mat = new vglModule.material();
   var blend = new vglModule.blend();
   var prog = new vglModule.shaderProgram();
-  var vertexShader = vglModule.utils.createVertexShader(gl);
-  var fragmentShader = vglModule.utils.createFragmentShader(gl);
+  var vertexShader = vglModule.utils.createTextureVertexShader(gl);
+  var fragmentShader = vglModule.utils.createTextureFragmentShader(gl);
   var posVertAttr = new vglModule.vertexAttribute("vertexPosition");
   var texCoordVertAttr = new vglModule.vertexAttribute("textureCoord");
   var colorVertAttr = new vglModule.vertexAttribute("vertexColor");
   var pointsizeUniform = new vglModule.floatUniform("pointSize", 5.0);
-  var opacityUniform = new vglModule.floatUniform("opacity", 0.5);
+  var opacityUniform = new vglModule.floatUniform("opacity", 1.0);
   var modelViewUniform = new vglModule.modelViewUniform("modelViewMatrix");
   var projectionUniform = new vglModule.projectionUniform("projectionMatrix");
   var samplerUniform = new vglModule.uniform(gl.INT, "sampler2d");
@@ -238,7 +236,6 @@ vglModule.utils.createPlane = function(originX, originY, originZ, point1X,
 vglModule.utils.createTexturePlane = function(originX, originY, originZ,
                                               point1X, point1Y, point1Z,
                                               point2X, point2Y, point2Z) {
-
   var mapper = new vglModule.mapper();
   var planeSource = new vglModule.planeSource();
   planeSource.setOrigin(originX, originY, originZ);

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

Summary of changes:
 web/lib/app.js       |    2 --
 web/lib/vgl/utils.js |    9 +++------
 2 files changed, 3 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
OpenGeoscience