Skip to content
Snippets Groups Projects
Commit 6f61699c authored by Matevz Tadel's avatar Matevz Tadel
Browse files

Merge the following revisions from branches/dev/fireworks:

35090, 35092, 35220


35090
=====

Author: alja
Date: Tue Aug 31 18:28:06 2010
New Revision: 35090

URL: http://root.cern.ch/viewvc?rev=35090&root=root&view=rev
Log:

Add new virtual function IsOnSubSpaceBoundrary() used when search of break point
with bisection to handle special case where edge of given interval is exactly on a break point.

Modified:
    branches/dev/fireworks/graf3d/eve/inc/TEveProjections.h
    branches/dev/fireworks/graf3d/eve/src/TEveProjections.cxx


35092
=====

Author: alja
Date: Tue Aug 31 19:02:13 2010
New Revision: 35092

URL: http://root.cern.ch/viewvc?rev=35092&root=root&view=rev
Log:

In TEveProjection::BisectBreakPoint() check if projected middle of given interval is on projected point.

Modified:
    branches/dev/fireworks/graf3d/eve/src/TEveProjections.cxx


35220
=====

Author: matevz
Date: Fri Sep 10 13:34:03 2010
New Revision: 35220

URL: http://root.cern.ch/viewvc?rev=35220&root=root&view=rev
Log:
* TEveJetCone, TEveJetConeGL
  Support automatic projection of TEveJetCone objectes by implementing
  TEveJetConeProjected class (with its own GL class).
  Subclass TEveJetCone from TEveShape.
  Store jet eta/phi/deta/dphi as data-members and calculate
  jet countour at calo boundary in renderer (instead of doing it in
  the main class). This is needed for proepr implementation of
  prejected views.

* TEveVector
  Add function Bool_t IsZero().

* TEveBox
  Fix docs.

* tutorials/eve/calorimeters.C
  Add two jet-cones.

Modified:
    branches/dev/fireworks/graf3d/eve/inc/LinkDef2.h
    branches/dev/fireworks/graf3d/eve/inc/TEveBox.h
    branches/dev/fireworks/graf3d/eve/inc/TEveJetCone.h
    branches/dev/fireworks/graf3d/eve/inc/TEveJetConeGL.h
    branches/dev/fireworks/graf3d/eve/inc/TEveVector.h
    branches/dev/fireworks/graf3d/eve/src/TEveBox.cxx
    branches/dev/fireworks/graf3d/eve/src/TEveJetCone.cxx
    branches/dev/fireworks/graf3d/eve/src/TEveJetConeGL.cxx
    branches/dev/fireworks/tutorials/eve/calorimeters.C


git-svn-id: http://root.cern.ch/svn/root/trunk@35221 27541ba8-7e3a-0410-8455-c3a389f83636
parent 1709878b
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment