Let superimpose TPolyLine3D and TPolyMarker3D with TGeo drawing

Author: linev

changes.md

@@ -5,6 +5,7 @@
 2. Enable geometry clipping in node.js
 3. Upgrade node.js packages
 4. Let draw TGeo object inside TCanvas
+5. Let superimpose TPolyLine3D and TPolyMarker3D with TGeo drawing
 
 
 ## Changes in 6.3.3

scripts/JSRoot.base3d.js

@@ -1409,9 +1409,16 @@ JSROOT.define(['d3', 'threejs_jsroot', 'painter'], (d3, THREE, jsrp) => {
       let line = this.getObject(),
           main = this.getFramePainter();
 
-      if (!main || !main.mode3d || !main.toplevel || !line)
+      if (!main || !main.mode3d || !line)
          return null;
 
+      if (!main.toplevel) {
+         let main = this.getMainPainter();
+         if (main && typeof main.drawExtras == 'function')
+            return main.drawExtras(line);
+         return null;
+      }
+
       let fN, fP, pnts = [];
 
       if (line._blob && (line._blob.length==4)) {

scripts/JSRoot.geom.js

@@ -2807,6 +2807,9 @@ JSROOT.define(['d3', 'three', 'geobase', 'painter', 'base3d'], (d3, THREE, geo,
       } else if (obj._typename === 'TGeoTrack') {
          if (!add_objects || this.addExtra(obj, itemname))
             promise = this.drawGeoTrack(obj, itemname);
+      } else if (obj._typename === 'TPolyLine3D') {
+         if (!add_objects || this.addExtra(obj, itemname))
+            promise = this.drawPolyLine(obj, itemname);
       } else if ((obj._typename === 'TEveTrack') || (obj._typename === 'ROOT::Experimental::TEveTrack')) {
          if (!add_objects || this.addExtra(obj, itemname))
             promise = this.drawEveTrack(obj, itemname);
@@ -2920,6 +2923,56 @@ JSROOT.define(['d3', 'three', 'geobase', 'painter', 'base3d'], (d3, THREE, geo,
       return true;
    }
 
+   /** @summary drawing TPolyLine3D */
+   TGeoPainter.prototype.drawPolyLine = function(line, itemname) {
+      if (!line) return false;
+
+      let track_width = line.fLineWidth || 1,
+          track_color = jsrp.getColor(line.fLineColor) || "#ff00ff";
+
+      if (JSROOT.browser.isWin) track_width = 1; // not supported on windows
+
+      let fN, fP;
+
+      if (line._blob && (line._blob.length == 4)) {
+         // workaround for custom streamer for JSON, should be resolved
+         fN = line._blob[1];
+         fP = line._blob[2];
+      } else {
+         fN = line.fN;
+         fP = line.fP;
+      }
+
+      let npoints = fN,
+          buf = new Float32Array((npoints-1)*6),
+          pos = 0, projv = this.ctrl.projectPos,
+          projx = (this.ctrl.project === "x"),
+          projy = (this.ctrl.project === "y"),
+          projz = (this.ctrl.project === "z");
+
+      for (let k = 0; k < npoints-1; ++k) {
+         buf[pos]   = projx ? projv : fP[k*3];
+         buf[pos+1] = projy ? projv : fP[k*3+1];
+         buf[pos+2] = projz ? projv : fP[k*3+2];
+         buf[pos+3] = projx ? projv : fP[k*3+3];
+         buf[pos+4] = projy ? projv : fP[k*3+4];
+         buf[pos+5] = projz ? projv : fP[k*3+5];
+         pos+=6;
+      }
+
+      let lineMaterial = new THREE.LineBasicMaterial({ color: track_color, linewidth: track_width }),
+          line3d = jsrp.createLineSegments(buf, lineMaterial);
+
+      line3d.renderOrder = 1000000; // to bring line to the front
+      line3d.geo_name = itemname;
+      line3d.geo_object = line;
+      line3d.hightlightWidthScale = 2;
+
+      this.addToExtrasContainer(line3d);
+
+      return true;
+   }
+
    /** @summary Drawing TEveTrack */
    TGeoPainter.prototype.drawEveTrack = function(track, itemname) {
       if (!track || (track.fN <= 0)) return false;