Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions hist/histpainter/src/TPainter3dAlgorithms.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ class by Rene Brun.
const Double_t kRad = TMath::ATan(1)*Double_t(4)/Double_t(180);
const Double_t kFdel = 0.;
const Double_t kDel = 0.0001;
const Double_t kEps = 1e-9; // exclude such small segments
const Double_t kEpsFaceMode2 = 1e-12; // minimal Z change in DrawFaceMode2
const Int_t kNiso = 4;
const Int_t kNmaxp = kNiso*13;
const Int_t kNmaxt = kNiso*12;
Expand Down Expand Up @@ -477,7 +479,10 @@ void TPainter3dAlgorithms::DrawFaceMode2(Int_t *, Double_t *xyz, Int_t np, Int_t
Int_t k1 = 0, k2 = 2;
Double_t z1 = (x[k1+1] - x[k1+0])*(y[k1+2] - y[k1+1]) - (y[k1+1] - y[k1+0])*(x[k1+2] - x[k1+1]);
Double_t z2 = (x[k2+1] - x[k2+0])*(y[k2+2] - y[k2+1]) - (y[k2+1] - y[k2+0])*(x[k2+2] - x[k2+1]);
if (z1 > z2) { k1 = 2; k2 = 0; }
// S.Linev Exclude flipping around same z
// only by 'significant' difference change rendering order
if (z1 > z2 + kEpsFaceMode2) { k1 = 2; k2 = 0; }

FillPolygon(3, &p3[3*k1], &ttt[k1]);
if (fMesh == 1) { // Draw border
gPad->PaintPolyLine(3, &x[k1], &y[k1]);
Expand Down Expand Up @@ -593,7 +598,8 @@ void TPainter3dAlgorithms::DrawFaceMove1(Int_t *icodes, Double_t *xyz, Int_t np,
y[0] = p1[1] + ydel*fT[2*it + 0];
x[1] = p1[0] + xdel*fT[2*it + 1];
y[1] = p1[1] + ydel*fT[2*it + 1];
gPad->PaintPolyLine(2, x, y);
if (TMath::Abs(fT[2*it + 0] - fT[2*it + 1]) > kEps)
gPad->PaintPolyLine(2, x, y);
}
}

Expand Down Expand Up @@ -621,7 +627,8 @@ void TPainter3dAlgorithms::DrawFaceMove1(Int_t *icodes, Double_t *xyz, Int_t np,
y[0] = p1[1] + ydel*fT[2*it + 0];
x[1] = p1[0] + xdel*fT[2*it + 1];
y[1] = p1[1] + ydel*fT[2*it + 1];
gPad->PaintPolyLine(2, x, y);
if (TMath::Abs(fT[2*it + 0] - fT[2*it + 1]) > kEps)
gPad->PaintPolyLine(2, x, y);
}
}

Expand Down Expand Up @@ -681,7 +688,8 @@ void TPainter3dAlgorithms::DrawFaceMove2(Int_t *icodes, Double_t *xyz, Int_t np,
y[0] = p1[1] + ydel*fT[2*it + 0];
x[1] = p1[0] + xdel*fT[2*it + 1];
y[1] = p1[1] + ydel*fT[2*it + 1];
gPad->PaintPolyLine(2, x, y);
if (TMath::Abs(fT[2*it + 0] - fT[2*it + 1]) > kEps)
gPad->PaintPolyLine(2, x, y);
}
}

Expand Down Expand Up @@ -763,7 +771,8 @@ void TPainter3dAlgorithms::DrawFaceMove3(Int_t *icodes, Double_t *xyz, Int_t np,
y[0] = p1[1] + ydel*fT[2*it + 0];
x[1] = p1[0] + xdel*fT[2*it + 1];
y[1] = p1[1] + ydel*fT[2*it + 1];
gPad->PaintPolyLine(2, x, y);
if (TMath::Abs(fT[2*it + 0] - fT[2*it + 1]) > kEps)
gPad->PaintPolyLine(2, x, y);
}
}
}
Expand Down
Loading