Fix - error in pcon/pgon shapes when Rmin===0

Author: linev

changes.md

@@ -7,6 +7,7 @@
 4. Fix - limit th2 text output size 
 5. Fix - use histogram fMinimum/fMaximum when drawing z axis in lego plot 
 6. Fix - error in TGeoCtub shape creation
+7. Fix - error in pcon/pgon shapes when Rmin===0 
 
 
 ## Changes in 4.5.1

scripts/JSRootGeoPainter.js

@@ -572,7 +572,6 @@
       return geometry;
    }
 
-
    JSROOT.GEO.createPolygon = function( shape ) {
 
       var thetaStart = shape.fPhi1, thetaLength = shape.fDphi;
@@ -589,6 +588,10 @@
 
       var color = new THREE.Color();
 
+      var hasrmin = false;
+      for (var layer=0; layer < shape.fNz; ++layer)
+         if (shape.fRmin[layer] > 0) hasrmin = true;
+
       var phi0 = thetaStart*Math.PI/180, dphi = thetaLength/radiusSegments*Math.PI/180;
 
       // calculate all sin/cos tables in advance
@@ -637,9 +640,12 @@
 
             var curr_indx = geometry.vertices.length;
 
-            // create vertices for the layer
-            for (var seg=0; seg < layerVerticies; ++seg)
-               geometry.vertices.push( new THREE.Vector3( rad*_cos[seg], rad*_sin[seg], layerz ));
+            // create vertices for the layer (if rmin===0, only central point is included
+            if ((side===0) || hasrmin)
+               for (var seg=0; seg < layerVerticies; ++seg)
+                  geometry.vertices.push( new THREE.Vector3( rad*_cos[seg], rad*_sin[seg], layerz ));
+            else
+               geometry.vertices.push( new THREE.Vector3( 0, 0, layerz ));
 
             if (pnts !== null) {
                if (side === 0) {
@@ -652,7 +658,7 @@
                }
             }
 
-            if (layer>0)  // create faces
+            if ((layer>0) && ((side===0) || hasrmin))  // create faces
                for (var seg=0;seg < radiusSegments;++seg) {
                   var seg1 = (seg + 1) % layerVerticies;
                   geometry.faces.push( new THREE.Face3( prev_indx + seg, (side === 0) ? (prev_indx + seg1) : (curr_indx + seg) , curr_indx + seg1, null, color, 0 ) );
@@ -669,8 +675,15 @@
          var inside = indxs[1][layer], outside = indxs[0][layer];
          for (var seg=0; seg < radiusSegments; ++seg) {
             var seg1 = (seg + 1) % layerVerticies;
-            geometry.faces.push( new THREE.Face3( outside + seg, (layer===0) ? (inside + seg) : (outside + seg1), inside + seg1, null, color, 0 ) );
-            geometry.faces.push( new THREE.Face3( outside + seg, inside + seg1, (layer===0) ? (outside + seg1) : (inside + seg), null, color, 0 ));
+            if (hasrmin) {
+               geometry.faces.push( new THREE.Face3( outside + seg, (layer===0) ? (inside + seg) : (outside + seg1), inside + seg1, null, color, 0 ) );
+               geometry.faces.push( new THREE.Face3( outside + seg, inside + seg1, (layer===0) ? (outside + seg1) : (inside + seg), null, color, 0 ));
+            } else
+            if (layer==0) {
+               geometry.faces.push( new THREE.Face3( outside + seg, inside, outside + seg1, null, color, 0 ));
+            } else {
+               geometry.faces.push( new THREE.Face3( outside + seg1, inside, outside + seg, null, color, 0 ));
+            }
          }
       }
 
@@ -705,7 +718,6 @@
       return geometry;
    }
 
-
    JSROOT.GEO.createXtru = function( shape ) {
 
       var geometry = new THREE.Geometry();