Improve TGeoSphere creation - handle all parameters combinations

Author: linev

changes.md

@@ -4,7 +4,7 @@
 1. Implement TGeoCtub, TGeoParaboloid and TGeoHype shapes
 2. Support TGeoTube with Rmin==0 
 3. Exclude empty faces in TGeoArb8  
-4. Improve TGeoSphere creation
+4. Improve TGeoSphere creation - handle all parameters combinations  
 5. Introduce JSROOT.cleanup() function to safely clear all drawn objects 
 6. Fix wrong resize method in 'tabs' and 'collapsible' layouts
 7. Fix canvas resize problem (issue #27)

scripts/JSRootGeoPainter.js

@@ -193,68 +193,78 @@
 
 
    JSROOT.GEO.createSphere = function( shape ) {
-
       var outerRadius = shape.fRmax;
       var innerRadius = shape.fRmin;
       var phiStart = shape.fPhi1 + 180;
       var phiLength = shape.fPhi2 - shape.fPhi1;
       var thetaStart = shape.fTheta1;
       var thetaLength = shape.fTheta2 - shape.fTheta1;
-
-      var widthSegments = Math.floor(phiLength / 6);
-      if (widthSegments < 8) widthSegments = 8;
-
-      var heightSegments = Math.floor(thetaLength / 6);
-      if (heightSegments < 8) heightSegments = 8;
+      var widthSegments = shape.fNseg;
+      var heightSegments = shape.fNz;
 
       var sphere = new THREE.SphereGeometry( outerRadius, widthSegments, heightSegments,
                                              phiStart*Math.PI/180, phiLength*Math.PI/180, thetaStart*Math.PI/180, thetaLength*Math.PI/180);
       sphere.applyMatrix( new THREE.Matrix4().makeRotationX( Math.PI / 2 ) );
 
-      // simple sphere without inner cut
-      if ((innerRadius <= 0) && (thetaLength === 180) && (phiLength === 360)) return sphere;
-
-      if (innerRadius <= 0) innerRadius = 0.0000001;
-
       var geometry = new THREE.Geometry();
       var color = new THREE.Color();
 
-      // add inner sphere
+      // add outer sphere
       for (var n=0; n < sphere.vertices.length; ++n)
          geometry.vertices.push(sphere.vertices[n]);
 
+      // add faces
       for (var n=0; n < sphere.faces.length; ++n) {
          var face = sphere.faces[n];
          geometry.faces.push(new THREE.Face3( face.a, face.b, face.c, null, color, 0 ) );
       }
 
       var shift = geometry.vertices.length;
-      var k = innerRadius / outerRadius;
+      var noInside = (innerRadius <= 0);
 
-      // add outer sphere
-      for (var n=0; n < sphere.vertices.length; ++n) {
-         var v = sphere.vertices[n];
-         geometry.vertices.push(new THREE.Vector3(k*v.x, k*v.y, k*v.z));
-      }
+      if (noInside) {
+         // simple sphere without inner cut
+         if ((thetaLength === 180) && (phiLength === 360)) {
+            geometry.computeFaceNormals();
+            return geometry;
+         }
 
-      for (var n=0; n < sphere.faces.length; ++n) {
-         var face = sphere.faces[n];
-         geometry.faces.push(new THREE.Face3( shift+face.a, shift+face.b, shift+face.c, null, color, 0 ) );
+         geometry.vertices.push(new THREE.Vector3(0, 0, 0));
+      } else {
+         var k = innerRadius / outerRadius;
+
+         // add inner sphere
+         for (var n=0; n < sphere.vertices.length; ++n) {
+            var v = sphere.vertices[n];
+            geometry.vertices.push(new THREE.Vector3(k*v.x, k*v.y, k*v.z));
+         }
+         for (var n=0; n < sphere.faces.length; ++n) {
+            var face = sphere.faces[n];
+            geometry.faces.push(new THREE.Face3( shift+face.a, shift+face.b, shift+face.c, null, color, 0 ) );
+         }
       }
 
       if (thetaLength !== 180) {
          // add top cap
          for (var i = 0; i < widthSegments; ++i) {
-            geometry.faces.push( new THREE.Face3( i+0, i+1, i+shift, null, color, 0 ) );
-            geometry.faces.push( new THREE.Face3( i+1, i+shift+1, i+shift, null, color, 0 ) );
+            if (noInside) {
+               geometry.faces.push( new THREE.Face3( i+0, i+1, shift, null, color, 0 ) );
+            } else {
+               geometry.faces.push( new THREE.Face3( i+0, i+1, i+shift, null, color, 0 ) );
+               geometry.faces.push( new THREE.Face3( i+1, i+shift+1, i+shift, null, color, 0 ) );
+            }
          }
 
          var dshift = sphere.vertices.length - widthSegments - 1;
 
          // add bottom cap
          for (var i = dshift; i < dshift + widthSegments; ++i) {
-            geometry.faces.push( new THREE.Face3( i+0, i+1, i+shift, null, color, 0 ) );
-            geometry.faces.push( new THREE.Face3( i+1, i+shift+1, i+shift, null, color, 0 ) );
+            if (noInside) {
+               geometry.faces.push( new THREE.Face3( i+0, i+1, shift, null, color, 0 ) );
+            } else {
+               geometry.faces.push( new THREE.Face3( i+0, i+1, i+shift, null, color, 0 ) );
+               geometry.faces.push( new THREE.Face3( i+1, i+shift+1, i+shift, null, color, 0 ) );
+            }
          }
       }
 
@@ -263,15 +273,23 @@
          for (var j=0; j<heightSegments; j++) {
             var i1 = j*(widthSegments+1);
             var i2 = (j+1)*(widthSegments+1);
-            geometry.faces.push( new THREE.Face3( i1, i2, i1+shift, null, color, 0 ) );
-            geometry.faces.push( new THREE.Face3( i2, i2+shift, i1+shift, null, color, 0 ));
+            if (noInside) {
+               geometry.faces.push( new THREE.Face3( i1, i2, shift, null, color, 0 ) );
+            } else {
+               geometry.faces.push( new THREE.Face3( i1, i2, i1+shift, null, color, 0 ) );
+               geometry.faces.push( new THREE.Face3( i2, i2+shift, i1+shift, null, color, 0 ));
+            }
          }
          // another cuted side
          for (var j=0;j<heightSegments;j++) {
             var i1 = (j+1)*(widthSegments+1) - 1;
             var i2 = (j+2)*(widthSegments+1) - 1;
-            geometry.faces.push( new THREE.Face3( i1, i2, i1+shift, null, color, 0 ) );
-            geometry.faces.push( new THREE.Face3( i2, i2+shift, i1+shift, null, color, 0));
+            if (noInside) {
+               geometry.faces.push( new THREE.Face3( i1, i2, shift, null, color, 0 ) );
+            } else {
+               geometry.faces.push( new THREE.Face3( i1, i2, i1+shift, null, color, 0 ) );
+               geometry.faces.push( new THREE.Face3( i2, i2+shift, i1+shift, null, color, 0));
+            }
          }
       }