[reve] Backport update on front and back camera clip to v6-36

cmake/modules/SearchInstalledSoftware.cmake

@@ -2101,8 +2101,8 @@ if(webgui)
   endif()
   ExternalProject_Add(
     RENDERCORE
-    URL ${CMAKE_SOURCE_DIR}/builtins/rendercore/RenderCore-1.7.tar.gz
-    URL_HASH SHA256=46cf6171ae0e16ba2f99789daaeb202146072af874ea530f06a0099c66c3e9b1
+    URL ${CMAKE_SOURCE_DIR}/builtins/rendercore/RenderCore-2.0.tar.gz
+    URL_HASH SHA256=6bdcf70fbdec1f950057ab1df722775c468ad6894f8a364f15f589d58c326667
     CONFIGURE_COMMAND ""
     BUILD_COMMAND ""
     INSTALL_COMMAND ""

graf3d/eve7/src/REveBoxSet.cxx

@@ -238,7 +238,7 @@ void REveBoxSet::AddHex(const REveVector& pos, Float_t r, Float_t angle, Float_t
    REveTrans t; // AMT do we need to reuse ???
    t.SetPos(pos.fX, pos.fY, pos.fZ);
    t.SetScale(r,r,depth);
-   t.RotatePF(1, 2, angle);
+   t.RotateLF(1, 2, angle * TMath::DegToRad());
    for(Int_t i=0; i<16; ++i)
    hex->fMat[i] = t[i];
 }
@@ -381,6 +381,9 @@ Int_t REveBoxSet::WriteCoreJson(nlohmann::json &j, Int_t rnr_offset)
 
 void REveBoxSet::BuildRenderData()
 {
+   if (fPlex.Size() == 0)
+      return;
+
    fRenderData = std::make_unique<REveRenderData>("makeBoxSet", fPlex.Size() * 24, 0, fPlex.Size());
 
    REveChunkManager::iterator bi(fPlex);
@@ -407,6 +410,14 @@ void REveBoxSet::BuildRenderData()
       // printf(" >>> resize render data %d \n", 4 * fTexX * fTexY);
       fRenderData->ResizeV(4 * fTexX * fTexY);
    }
+
+   // save bbox in render data normals
+   ComputeBBox();
+   float* bb = GetBBox();
+   fRenderData->PushN(bb[0], bb[1], bb[2]);
+   fRenderData->PushN(bb[3], bb[4], bb[5]);
+
+   REveElement::BuildRenderData();
 }
 
 ////////////////////////////////////////////////////////////////////////////////

graf3d/eve7/src/REvePointSet.cxx

@@ -239,16 +239,24 @@ void REvePointSet::BuildRenderData()
    if (fSize > 0)
    {
       if (gEve->IsRCore()) {
-         fRenderData = std::make_unique<REveRenderData>("makeHit", 4*fTexX*fTexY);
+         fRenderData = std::make_unique<REveRenderData>("makeHit", 4*fTexX*fTexY, 6);
          for (int i = 0; i < fSize; ++i) {
             fRenderData->PushV(&fPoints[i].fX, 3);
             fRenderData->PushV(0);
          }
          fRenderData->ResizeV(4*fTexX*fTexY);
+
+         // save bbox in render data normals
+         ComputeBBox();
+         float* bb = GetBBox();
+         fRenderData->PushN(bb[0], bb[1], bb[2]);
+         fRenderData->PushN(bb[3], bb[4], bb[5]);
       } else {
          fRenderData = std::make_unique<REveRenderData>("makeHit", 3*fSize);
          fRenderData->PushV(&fPoints[0].fX, 3*fSize);
       }
+
+      REveElement::BuildRenderData();
    }
 }
 

ui5/eve7/lib/EveElementsRCore.js

@@ -885,6 +885,10 @@ sap.ui.define(['rootui5/eve7/lib/EveManager'], function (EveManager)
             rnr_data.vtxBuff, hit.fTexX, hit.fTexY,
             txName);
 
+         // bounding box
+         let bb = rnr_data.nrmBuff;
+         s.geometry.setExternalBoundingBox(new RC.Box3(new RC.Vector3(bb[0], bb[2], bb[4]), new RC.Vector3(bb[1], bb[3], bb[5])));
+
          this.RcPickable(hit, s);
 
          return s;
@@ -1251,10 +1255,17 @@ sap.ui.define(['rootui5/eve7/lib/EveManager'], function (EveManager)
       {
          if (this.TestRnr("boxset", boxset, rnr_data)) return null;
          // use instancing if texture coordinates
+         let mesh;
          if (boxset.instanced === true)
-            return this.makeBoxSetInstanced(boxset, rnr_data);
+            mesh = this.makeBoxSetInstanced(boxset, rnr_data);
          else
-            return this.makeFreeBoxSet(boxset, rnr_data);
+            mesh = this.makeFreeBoxSet(boxset, rnr_data);
+
+         // bounding box
+         let bb = rnr_data.nrmBuff;
+         mesh.geometry.setExternalBoundingBox(new RC.Box3(new RC.Vector3(bb[0], bb[2], bb[4]), new RC.Vector3(bb[1], bb[3], bb[5])));
+
+         return mesh;
       }
 
       makeFreeBoxSet(boxset, rnr_data)

ui5/eve7/lib/EveScene.js

@@ -201,8 +201,15 @@ sap.ui.define(['rootui5/eve7/lib/EveManager'], function(EveManager) {
                this.update3DObjectsVisibility(p.childs, true);
                this.need_visibility_update = false;
             }
-            this.glctrl.viewer.render();
 
+            // To improve when bbox info is streamed.
+            // Recalc scene bbox -- and update viewer total bbox, from scene boxes.
+            // 1. recalc-scene-bbox from known element bboxes (streamed)
+            //    [ this could really be done on the server ]
+            // 2. tell viewer to recalc-total-bbox ONLY from scene bboxes.
+
+            // For now just refresh the gl-viewer.
+            this.glctrl.viewer.request_render(true);
          }
       }
 

ui5/eve7/lib/GlViewerRCore.js

@@ -87,6 +87,8 @@ sap.ui.define([
                   return canvasDOM;
                };
 
+               pthis.ApplyTemporaryRCoreExtensions();
+
                pthis.bootstrap();
             });
          } else {
@@ -203,6 +205,7 @@ sap.ui.define([
          this.renderer.clearColor = "#00000000";
          this.scene = new RC.Scene();
          this.overlay_scene = new RC.Scene();
+         this.scene_bbox = new RC.Box3();
 
          this.lights = new RC.Group;
          this.lights.name = "Light container";
@@ -470,18 +473,23 @@ sap.ui.define([
          this.resetRenderer();
       }
 
-      resetRenderer()
+      recalcSceneBBox()
       {
-         let sbbox = new RC.Box3();
-         sbbox.setFromObject( this.scene );
-         if (sbbox.isEmpty())
+         this.scene_bbox.setFromObject( this.scene );
+         if (this.scene_bbox.isEmpty())
          {
-            console.error("GlViewerRenderCore.resetRenderer scene bbox empty", sbbox);
+            console.error("GlViewerRenderCore.resetRenderer scene bbox empty", this.scene_bbox);
             const ext = 100;
-            sbbox.expandByPoint(new RC.Vector3(-ext,-ext,-ext));
-            sbbox.expandByPoint(new RC.Vector3( ext, ext, ext));
+            this.scene_bbox.expandByPoint(new RC.Vector3(-ext,-ext,-ext));
+            this.scene_bbox.expandByPoint(new RC.Vector3( ext, ext, ext));
          }
+      }
+
+      resetRenderer()
+      {
+         this.recalcSceneBBox();
 
+         let sbbox = this.scene_bbox;
          let posV = new RC.Vector3; posV.subVectors(sbbox.max, this.rot_center);
          let negV = new RC.Vector3; negV.subVectors(sbbox.min, this.rot_center);
 
@@ -535,6 +543,19 @@ sap.ui.define([
          this.controls.update();
       }
 
+      setupCamera()
+      {
+         // To be used with JS debugger to edit the values as needed.
+
+         let pos = new RC.Vector3;
+         let lookat = new RC.Vector3;
+         let fov = 30; // in degrees
+
+         console.log("A good place to set the breakpoint and edit the values");
+
+         // Call the controller stuff, hope it's not all local, otherwise we need to edit it there.
+         // Sigh, should really have it (and RedeQuTor) in ROOT.
+      }
 
       updateViewerAttributes()
       {
@@ -636,10 +657,11 @@ sap.ui.define([
 
       //==============================================================================
 
-      request_render()
+      request_render(recalc_sbbox=false)
       {
          // console.log("REQUEST RENDER");
 
+         this.render_requested_recalc_sbbox ||= recalc_sbbox;
          if (this.render_requested) return;
          setTimeout(this.render.bind(this), 0);
          this.render_requested = true;
@@ -650,6 +672,13 @@ sap.ui.define([
          // console.log("RENDER", this.scene, this.camera, this.canvas, this.renderer);
 
          this.render_requested = false;
+         if (this.render_requested_recalc_sbbox) {
+            this.recalcSceneBBox();
+            this.render_requested_recalc_sbbox = false;
+         }
+         if (this.camera.isPerspectiveCamera) {
+            this.camera.optimizeNearFar(this.scene_bbox);
+         }
 
          if (this.canvas.width <= 0 || this.canvas.height <= 0) return;
 
@@ -1215,6 +1244,25 @@ sap.ui.define([
          </html>`);
          win.document.close();
       }
+
+      //==============================================================================
+      // Temporary RCore additions (to avoid updating of RCore.tgz)
+      //==============================================================================
+
+      ApplyTemporaryRCoreExtensions() {
+         console.log("GlViewerRCore.ApplyTemporaryRCoreExtensions()");
+
+         // E.g.:
+         // if (RC.PerspectiveCamera.prototype.optimizeNearFar === undefined) {
+         //    RC.PerspectiveCamera.prototype.optimizeNearFar = function(scene_bbox) {
+         //       this.matrixWorldInverse.getInverse(this.matrixWorld);
+         //       // .....
+         //    };
+         // }
+      }
+
+      //==============================================================================
+
    } // class GlViewerRCore
 
    return GlViewerRCore;