Changeset 22434 for issm/trunk-jpl/src/m/plot/plot_unit.js

Timestamp:

02/20/18 16:27:26 (7 years ago)

Author:

dlcheng

Message:

CHG (JS): Updating js scripts.

File:

• issm/trunk-jpl/src/m/plot/plot_unit.js (modified) (4 diffs)

issm/trunk-jpl/src/m/plot/plot_unit.js

@@ -7 +7 @@
         //   See also: PLOTMODEL, PLOT_MANAGER
 
-        //if ('unit' in canvas.nodes) {
-        //      if (
-        //      canvas.nodes.unit.updateBuffer('Coords', data);
-        //      return;
-        //}
-        //else {
+        var name = 'unit';
+        if ('unit' in canvas.nodes) {
+                if (options.getfieldvalue('clf','on')=='on') {
+                        for (var node in canvas.nodes) {
+                                if (node.startsWith('unit')) {
+                                        delete canvas.octrees[node];
+                                        delete canvas.nodes[node];
+                                }
+                        }
+                }
+                else {
+                        name = 'unit' + Object.keys(canvas.nodes).length;
+                }
+        }
 
         //{{{ declare variables:
@@ -37 +45 @@
         }
         else {
-                vertices = Node.prototype.scaleVertices(md, x, y, z, elements, options.getfieldvalue('heightscale', 1), options.getfieldvalue('maskscale',{}));
+                vertices = Node.prototype.scaleVertices(md, x, y, z, elements, options.getfieldvalue('heightscale', 1), options.getfieldvalue('maskregion',{'enabled':false}));
                 scale = [1, 1, 1];
         }
@@ -44 +52 @@
         var edgecolor = options.getfieldvalue('edgecolor', [1.0, 1.0, 1.0 ,1.0]);
         var maskzeros = options.getfieldvalue('maskzeros', {});
+        var render = options.getfieldvalue('render', {});
+        var cullFace = ("unit" in render) ? canvas.gl[render.unit.cullFace] : canvas.gl.BACK;
         var node = new Node(
                 'canvas', canvas,
                 'options', options,
-                'name', 'unit',
+                'name', name,
                 'shaderName', 'TexturedDiffuse',
                 'alpha', options.getfieldvalue('alpha', 1.0),
                 'caxis', options.getfieldvalue('caxis',[ArrayMin(data), ArrayMax(data)]),
-                //'center', [(xlim[0] + xlim[1]) / 2, (ylim[0] + ylim[1]) / 2, md.mesh.classname() === 'mesh3dsurface' ? (zlim[0] + zlim[1]) / 2 : zlim[0]],
                 'center', [(xlim[0] + xlim[1]) / 2, (ylim[0] + ylim[1]) / 2, (zlim[0] + zlim[1]) / 2],
-                'lightingBias', 0.8,
+                'cullFace', cullFace,
+                'lightingBias', canvas.view.lightingBias,
                 'diffuseColor', edgecolor,
                 'specularStrength', 0.0,
-                'enabled', options.getfieldvalue('nodata','off') == 'off',
+                'enabled', options.getfieldvalue('nodata','off') == 'off' || (("unit" in render) && render.unit.enabled),
                 'log', options.getfieldvalue('log',false),
                 'maskEnabled', options.getfieldvalue('innermask','off') == 'on',
                 'maskHeight', options.getfieldvalue('innermaskheight', 150.0) / options.getfieldvalue('heightscale', 1),
                 'maskColor', options.getfieldvalue('innermaskcolor',[0.0, 0.0, 1.0, 1.0]),
+                'maskObject', options.getfieldvalue('maskregion',{'enabled':false}),
                 'maskZerosColor', defaultFor(maskzeros.color,[1.0, 1.0, 1.0, 1.0]),
                 'maskZerosEnabled', defaultFor(maskzeros.enabled,false),
@@ -66 +77 @@
                 'maskZerosZeroValue', defaultFor(maskzeros.zeroValue,0.5),
                 'rotation', [-90, 0, 0],
-                'scale', scale
+                'scale', ("unit" in render) ? [render.unit.scale, render.unit.scale, render.unit.scale] : scale
         );
         //}
-        canvas.unitNode = node;
-        canvas.unitData = data;
+        if (options.getfieldvalue('clf','on')=='on') {
+                canvas.unitNode = node;
+                canvas.unitData = data;
+        }
         //}}}
         switch(datatype){