From d915f3188aee6dbe6a5c24b4458c88d8e6dbdf6d Mon Sep 17 00:00:00 2001
From: Sergey Linev <S.Linev@gsi.de>
Date: Fri, 11 Jan 2019 14:11:56 +0100
Subject: [PATCH] [geom viewer] send shape normals to client when they are
calculated
---
graf3d/eve7/src/REveGeoPolyShape.cxx | 9 ++++++---
graf3d/eve7/src/REveTrack.cxx | 1 -
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/graf3d/eve7/src/REveGeoPolyShape.cxx b/graf3d/eve7/src/REveGeoPolyShape.cxx
index ffb66002796..928d5395239 100644
--- a/graf3d/eve7/src/REveGeoPolyShape.cxx
+++ b/graf3d/eve7/src/REveGeoPolyShape.cxx
@@ -161,10 +161,13 @@ void REveGeoPolyShape::FillRenderData(REveRenderData &rd)
{
// We know all elements are triangles. Or at least they should be.
- rd.Reserve(fVertices.size(), 0, 2 + fNbPols * 3);
+ rd.Reserve(fVertices.size(), fNormals.size(), 2 + fNbPols * 3);
- for (Int_t i = 0; i < (Int_t)fVertices.size(); ++i)
- rd.PushV(fVertices[i]);
+ for (auto &v: fVertices)
+ rd.PushV(v);
+
+ for (auto &n: fNormals)
+ rd.PushN(n);
rd.PushI(REveRenderData::GL_TRIANGLES);
rd.PushI(fNbPols);
diff --git a/graf3d/eve7/src/REveTrack.cxx b/graf3d/eve7/src/REveTrack.cxx
index ec25d7bb78d..a0733b95248 100644
--- a/graf3d/eve7/src/REveTrack.cxx
+++ b/graf3d/eve7/src/REveTrack.cxx
@@ -12,7 +12,6 @@
#include <ROOT/REveTrack.hxx>
#include <ROOT/REveTrackPropagator.hxx>
#include <ROOT/REvePointSet.hxx>
-#include <ROOT/REveRenderData.hxx>
#include "TParticle.h"
#include "TPolyLine3D.h"
--
GitLab