Log of /trunk/graf3d/gl/src/TPointSet3DGL.cxx
Parent Directory
Revision
33864 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Jun 14 09:47:19 2010 UTC (4 years, 7 months ago) by
matevz
File length: 3184 byte(s)
Diff to
previous 24214
Merge the following revisions from the fireworks branch:
33631, 33666, 33668, 33690, 33700, 33701, 33702, 33704, 33751, 33753,
33767, 33770, 33774, 33787, 33789, 33790, 33791, 33792, 33796, 33798,
33804, 33817, 33823, 33825
gl/:
----
- extensions for transparency handling in TGLUtil;
- allow disabling of internal viewer selection;
- allow fixing of default camera center;
- fix global light placement -- it was only correct for XoZ floor or
when scene center was at the origin.
eve/:
-----
- propagation of main transparency to projected replicas and to
compound members;
- when projecting TEveStraightLineSet in RhoZ, break lines crossing
the separating plane (required change of internal representation);
- anti-flickering support for TEveBoxSet;
- proper multiple-selection handling in TEveCalo classes;
- small new features, bug fixes in TEveCalo classes.
33631
=====
Author: alja
Date: Fri May 28 12:50:27 2010
New Revision: 33631
URL: http://root.cern.ch/viewvc?rev=33631&root=root&view=rev
Log:
Fix bug in tool tip.
Modified:
branches/dev/fireworks/graf3d/eve/src/TEveCaloData.cxx
33666
=====
Author: matevz
Date: Mon May 31 13:41:54 2010
New Revision: 33666
URL: http://root.cern.ch/viewvc?rev=33666&root=root&view=rev
Log:
Propagate main transparency the same way as main color is propagated:
- from projectables to projecteds;
- in CopyVizParams();
- in TEveCompound to children depending on the following CSC bit settings:
kCSCBApplyMainTransparencyToAllChildren
kCSCBApplyMainTransparencyToMatchingChildren
In TEveElementList add member 'Bool_t fDoTransparency' (analoguous to
fDoColor).
Modified:
branches/dev/fireworks/graf3d/eve/inc/TEveCompound.h
branches/dev/fireworks/graf3d/eve/inc/TEveElement.h
branches/dev/fireworks/graf3d/eve/inc/TEveProjectionBases.h
branches/dev/fireworks/graf3d/eve/src/TEveCompound.cxx
branches/dev/fireworks/graf3d/eve/src/TEveElement.cxx
branches/dev/fireworks/graf3d/eve/src/TEveProjectionBases.cxx
33668
=====
Author: matevz
Date: Mon May 31 15:44:20 2010
New Revision: 33668
URL: http://root.cern.ch/viewvc?rev=33668&root=root&view=rev
Log:
In TEveelement introduce Bool_t members fCanEditMainColor and
fCanEditMainTransparency. The corresponding base-class functions now
return the value of these data members.
In most sub-classes that require editng of main color and transparency
it was now enough to set these data-members to kTRUE in constructors.
Further, this allows per object setting of color / transparency
editability via:
void SetEditMainColor(Bool_t);
void SetEditMainTransparency(Bool_t);
Modified:
branches/dev/fireworks/graf3d/eve/inc/TEveArrow.h
branches/dev/fireworks/graf3d/eve/inc/TEveCalo.h
branches/dev/fireworks/graf3d/eve/inc/TEveDigitSet.h
branches/dev/fireworks/graf3d/eve/inc/TEveElement.h
branches/dev/fireworks/graf3d/eve/inc/TEveGeoShape.h
branches/dev/fireworks/graf3d/eve/inc/TEveShape.h
branches/dev/fireworks/graf3d/eve/inc/TEveText.h
branches/dev/fireworks/graf3d/eve/src/TEveArrow.cxx
branches/dev/fireworks/graf3d/eve/src/TEveCalo.cxx
branches/dev/fireworks/graf3d/eve/src/TEveDigitSet.cxx
branches/dev/fireworks/graf3d/eve/src/TEveElement.cxx
branches/dev/fireworks/graf3d/eve/src/TEveGeoShape.cxx
branches/dev/fireworks/graf3d/eve/src/TEveShape.cxx
branches/dev/fireworks/graf3d/eve/src/TEveText.cxx
33690
=====
Author: matevz
Date: Tue Jun 1 13:07:46 2010
New Revision: 33690
URL: http://root.cern.ch/viewvc?rev=33690&root=root&view=rev
Log:
Add transparency argument to TGLUtil:
RenderPolyMarkers(...)
RenderPolyLine(...)
In eve/ use Char_t for transparency (as it is in gl/).
Until now UChar_t was used in eve/.
Modified:
branches/dev/fireworks/graf3d/eve/inc/TEveCalo.h
branches/dev/fireworks/graf3d/eve/inc/TEveCaloLegoOverlay.h
branches/dev/fireworks/graf3d/eve/inc/TEveCompound.h
branches/dev/fireworks/graf3d/eve/inc/TEveDigitSet.h
branches/dev/fireworks/graf3d/eve/inc/TEveElement.h
branches/dev/fireworks/graf3d/eve/inc/TEveGeoNode.h
branches/dev/fireworks/graf3d/eve/inc/TEveProjectionBases.h
branches/dev/fireworks/graf3d/eve/inc/TEveTriangleSet.h
branches/dev/fireworks/graf3d/eve/inc/TEveUtil.h
branches/dev/fireworks/graf3d/eve/src/TEveCaloLegoEditor.cxx
branches/dev/fireworks/graf3d/eve/src/TEveCaloLegoOverlay.cxx
branches/dev/fireworks/graf3d/eve/src/TEveCaloVizEditor.cxx
branches/dev/fireworks/graf3d/eve/src/TEveCompound.cxx
branches/dev/fireworks/graf3d/eve/src/TEveDigitSet.cxx
branches/dev/fireworks/graf3d/eve/src/TEveElement.cxx
branches/dev/fireworks/graf3d/eve/src/TEveElementEditor.cxx
branches/dev/fireworks/graf3d/eve/src/TEveGeoNode.cxx
branches/dev/fireworks/graf3d/eve/src/TEveLineGL.cxx
branches/dev/fireworks/graf3d/eve/src/TEveProjectionBases.cxx
branches/dev/fireworks/graf3d/eve/src/TEveRGBAPalette.cxx
branches/dev/fireworks/graf3d/eve/src/TEveStraightLineSetGL.cxx
branches/dev/fireworks/graf3d/eve/src/TEveTrackGL.cxx
branches/dev/fireworks/graf3d/eve/src/TEveTrackProjectedGL.cxx
branches/dev/fireworks/graf3d/eve/src/TEveUtil.cxx
branches/dev/fireworks/graf3d/gl/inc/TGLUtil.h
branches/dev/fireworks/graf3d/gl/src/TGLUtil.cxx
branches/dev/fireworks/graf3d/gl/src/TPointSet3DGL.cxx
33700
=====
Author: matevz
Date: Tue Jun 1 18:55:06 2010
New Revision: 33700
URL: http://root.cern.ch/viewvc?rev=33700&root=root&view=rev
Log:
Do not overload TGLUtil::Color() for setting alpha and transparency --
name the functions ColorAlpha() and ColorTransparency().
In TEveStraightLineSetGL pass main-transparency also as transparency
of the marker.
Modified:
branches/dev/fireworks/graf3d/eve/src/TEveStraightLineSetGL.cxx
branches/dev/fireworks/graf3d/gl/inc/TGLUtil.h
branches/dev/fireworks/graf3d/gl/src/TGLPhysicalShape.cxx
branches/dev/fireworks/graf3d/gl/src/TGLUtil.cxx
branches/dev/fireworks/graf3d/gl/src/TGLViewer.cxx
33701
=====
Author: matevz
Date: Tue Jun 1 20:36:47 2010
New Revision: 33701
URL: http://root.cern.ch/viewvc?rev=33701&root=root&view=rev
Log:
TEveProjections:
- Add virtual function
BisectBreakPoint(TEveVector& vL, TEveVector& vR, Float_t eps_sqr=1e-10f);
that find both edges of a segment that is split over two
non-contiguous space-regions.
TEveStraightLineSet:
- Handle breaking of each line segment in a projection and create two
separate parts.
Modified:
branches/dev/fireworks/graf3d/eve/inc/TEveProjections.h
branches/dev/fireworks/graf3d/eve/inc/TEveStraightLineSet.h
branches/dev/fireworks/graf3d/eve/src/TEveProjections.cxx
branches/dev/fireworks/graf3d/eve/src/TEveStraightLineSet.cxx
branches/dev/fireworks/graf3d/eve/src/TEveStraightLineSetGL.cxx
33702
=====
Author: matevz
Date: Tue Jun 1 21:18:54 2010
New Revision: 33702
URL: http://root.cern.ch/viewvc?rev=33702&root=root&view=rev
Log:
Simplify internal representation of marker in a line-set.
Modified:
branches/dev/fireworks/graf3d/eve/inc/TEveStraightLineSet.h
branches/dev/fireworks/graf3d/eve/src/TEveStraightLineSet.cxx
branches/dev/fireworks/graf3d/eve/src/TEveStraightLineSetGL.cxx
33704
=====
Author: matevz
Date: Tue Jun 1 21:28:27 2010
New Revision: 33704
URL: http://root.cern.ch/viewvc?rev=33704&root=root&view=rev
Log:
Remove unused variable.
Modified:
branches/dev/fireworks/graf3d/eve/src/TEveStraightLineSetGL.cxx
33751
=====
Author: matevz
Date: Fri Jun 4 16:14:12 2010
New Revision: 33751
URL: http://root.cern.ch/viewvc?rev=33751&root=root&view=rev
Log:
Small fixes for track rendering.
TEveTrack
- Implement virtual ComputeBBox() to include path-mark positions in
the bounding box calculation.
TEveTrackGL
- Number of visible path-marks was computed wrongly.
TEvePointSet
- Remove virtual ComputeBBox() -- it was just calling the base-class
version.
TPointSet3D
- Simplify ComputeBBox().
Modified:
branches/dev/fireworks/graf3d/eve/inc/TEvePointSet.h
branches/dev/fireworks/graf3d/eve/inc/TEveTrack.h
branches/dev/fireworks/graf3d/eve/src/TEvePointSet.cxx
branches/dev/fireworks/graf3d/eve/src/TEveTrack.cxx
branches/dev/fireworks/graf3d/eve/src/TEveTrackGL.cxx
branches/dev/fireworks/graf3d/g3d/src/TPointSet3D.cxx
33753
=====
Author: matevz
Date: Fri Jun 4 16:45:38 2010
New Revision: 33753
URL: http://root.cern.ch/viewvc?rev=33753&root=root&view=rev
Log:
Move anti-flickering flag from TEveQuadSet to TEveDigitSet.
Implement it in TEveBoxSet-GL rendering, too.
Modified:
branches/dev/fireworks/graf3d/eve/inc/TEveDigitSet.h
branches/dev/fireworks/graf3d/eve/inc/TEveQuadSet.h
branches/dev/fireworks/graf3d/eve/src/TEveBoxSetGL.cxx
branches/dev/fireworks/graf3d/eve/src/TEveDigitSet.cxx
branches/dev/fireworks/graf3d/eve/src/TEveQuadSet.cxx
33767
=====
Author: alja
Date: Mon Jun 7 19:49:03 2010
New Revision: 33767
URL: http://root.cern.ch/viewvc?rev=33767&root=root&view=rev
Log:
In TEveCaloDataVec add interface to add new slice and getters to read slice values and cell geometry.
Modified:
branches/dev/fireworks/graf3d/eve/inc/TEveCaloData.h
branches/dev/fireworks/graf3d/eve/src/TEveCaloData.cxx
33770
=====
Author: matevz
Date: Tue Jun 8 11:54:09 2010
New Revision: 33770
URL: http://root.cern.ch/viewvc?rev=33770&root=root&view=rev
Log:
Take the right fP for point-array when calculating bounding-box.
Modified:
branches/dev/fireworks/graf3d/eve/src/TEveTrack.cxx
33774
=====
Author: alja
Date: Tue Jun 8 13:09:52 2010
New Revision: 33774
URL: http://root.cern.ch/viewvc?rev=33774&root=root&view=rev
Log:
TEveCaloLegoGL:
Fix picking in kValSizeOutline mode.
TEveCaloLegoEditor:
Fix last enum in 2D mode entry.
Modified:
branches/dev/fireworks/graf3d/eve/src/TEveCaloLegoEditor.cxx
branches/dev/fireworks/graf3d/eve/src/TEveCaloLegoGL.cxx
33787
=====
Author: matevz
Date: Tue Jun 8 18:24:27 2010
New Revision: 33787
URL: http://root.cern.ch/viewvc?rev=33787&root=root&view=rev
Log:
Fix invalid iterator access reported by valgrind.
Modified:
branches/dev/fireworks/graf3d/eve/src/TEveCaloLegoGL.cxx
33789
=====
Author: matevz
Date: Tue Jun 8 19:08:23 2010
New Revision: 33789
URL: http://root.cern.ch/viewvc?rev=33789&root=root&view=rev
Log:
Fix another invalid iterator access reported by valgrind.
Modified:
branches/dev/fireworks/graf3d/eve/src/TEveCaloLegoGL.cxx
33790
=====
Author: alja
Date: Tue Jun 8 19:51:15 2010
New Revision: 33790
URL: http://root.cern.ch/viewvc?rev=33790&root=root&view=rev
Log:
Bugfix:: In TEveCaloDataVec::AddSlice initalise vector of tower values.
Modified:
branches/dev/fireworks/graf3d/eve/src/TEveCaloData.cxx
33791
=====
Author: matevz
Date: Tue Jun 8 22:31:00 2010
New Revision: 33791
URL: http://root.cern.ch/viewvc?rev=33791&root=root&view=rev
Log:
Add flag allowing to disable internal GL-viewer selection.
To disable it call:
handler->SetDoInternalSelection(kFALSE);
Modified:
branches/dev/fireworks/graf3d/gl/inc/TGLEventHandler.h
branches/dev/fireworks/graf3d/gl/src/TGLEventHandler.cxx
33792
=====
Author: matevz
Date: Tue Jun 8 23:08:09 2010
New Revision: 33792
URL: http://root.cern.ch/viewvc?rev=33792&root=root&view=rev
Log:
Add option to fix the default camera center.
To activate, call:
camera->SetFixDefCenterVec(x, y, z);
camera->SetFixDefCenter(kTRUE);
This will take effect on next camera reset.
External center still overrides the setting.
Modified:
branches/dev/fireworks/graf3d/gl/inc/TGLCamera.h
branches/dev/fireworks/graf3d/gl/src/TGLCamera.cxx
branches/dev/fireworks/graf3d/gl/src/TGLOrthoCamera.cxx
branches/dev/fireworks/graf3d/gl/src/TGLPerspectiveCamera.cxx
33796
=====
Author: alja
Date: Wed Jun 9 12:51:06 2010
New Revision: 33796
URL: http://root.cern.ch/viewvc?rev=33796&root=root&view=rev
Log:
Fix bug in redering of selected cells in case cells are highlighted the same time.
Modified:
branches/dev/fireworks/graf3d/eve/src/TEveCaloLegoGL.cxx
33798
=====
Author: matevz
Date: Wed Jun 9 15:28:30 2010
New Revision: 33798
URL: http://root.cern.ch/viewvc?rev=33798&root=root&view=rev
Log:
White space.
Modified:
branches/dev/fireworks/graf3d/eve/src/TEveCaloLegoGL.cxx
33804
=====
Author: matevz
Date: Wed Jun 9 20:49:33 2010
New Revision: 33804
URL: http://root.cern.ch/viewvc?rev=33804&root=root&view=rev
Log:
Use central function TEveCaloData::ProcessSelection(...) to process
(multiple secondary) selection from all GL renderers (3D, 2D and
Lego).
Fix rendering of non-rebinned lego for multiple selection.
Modified:
branches/dev/fireworks/graf3d/eve/inc/TEveCaloData.h
branches/dev/fireworks/graf3d/eve/src/TEveCalo2DGL.cxx
branches/dev/fireworks/graf3d/eve/src/TEveCalo3DGL.cxx
branches/dev/fireworks/graf3d/eve/src/TEveCaloData.cxx
branches/dev/fireworks/graf3d/eve/src/TEveCaloLegoGL.cxx
33817
=====
Author: matevz
Date: Thu Jun 10 15:31:17 2010
New Revision: 33817
URL: http://root.cern.ch/viewvc?rev=33817&root=root&view=rev
Log:
Do not redraw if the widget is not mapped.
Add option to block redraw in UpdateScene().
Modified:
branches/dev/fireworks/graf3d/gl/inc/TGLViewer.h
branches/dev/fireworks/graf3d/gl/src/TGLViewer.cxx
33823
=====
Author: matevz
Date: Thu Jun 10 16:25:59 2010
New Revision: 33823
URL: http://root.cern.ch/viewvc?rev=33823&root=root&view=rev
Log:
Fix placement of global lights.
Modified:
branches/dev/fireworks/graf3d/gl/src/TGLLightSet.cxx
33825
=====
Author: matevz
Date: Thu Jun 10 16:47:54 2010
New Revision: 33825
URL: http://root.cern.ch/viewvc?rev=33825&root=root&view=rev
Log:
Hide tooltip on key event.
Modified:
branches/dev/fireworks/graf3d/gl/src/TGLEventHandler.cxx
Revision
24214 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Jun 11 14:48:35 2008 UTC (6 years, 7 months ago) by
matevz
File length: 3181 byte(s)
Diff to
previous 23140
TGLObject and subclasses
-----------------------------------------
Introduce new member 'Bool_t TGLObject::fMultiColor' that specifies
whether the class uses multiple colors for its rendering. This
information is important when drawing highlight or outlines around
objects as display-lists can not be used if color-state changes are
stored in them.
With this modification most of the logick for
virtual Bool_t TGLLogicalShape::ShouldDLCache(...)
can be implemented in TGLObject version.
Most of the GL-rendering classes have been fixed to properly set the
fMultiColor state and rely on the TGLObject::ShouldDLCache().
TGLPhysicalShape
----------------
Use TGLLogicalShape::Draw() instead of DirectDraw() when drawing
highlights to allow usage of display-lists for classes that do not use
multiple colors.
TGLUtil
-------
Decrease the default draw-quality for DrawLine/Cylinder/Sphere/Disk to
10. With software rendering the previous value of 60 caused very low
refresh rates.
Introduce two inner classes TDrawQualityModifier and
TDrawQualityScaler allowing easy/safe modification of draw-quality for
the above functions.
Introduce inner class TColorLocker allowing easy/safe modification of
color-lock state.
Revision
23140 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Apr 11 11:01:39 2008 UTC (6 years, 9 months ago) by
rdm
File length: 3185 byte(s)
Diff to
previous 22539
move the following directories to "graf2d":
asimage, freetype, gpad, graf, postscript, qt, win32gdk, x11, x11ttf
move the following directories to "graf3d":
eve, ftgl, g3d, gl, x3d
Revision
22539 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Sat Mar 8 14:36:37 2008 UTC (6 years, 10 months ago) by
rdm
Original Path:
trunk/gl/src/TPointSet3DGL.cxx
File length: 3185 byte(s)
Diff to
previous 21653
From Alja, Bertrand & Matevz: merged branches/dev/fireworks 21757:22514.
This includes:
- development for event-displays of ALICE and CMS since 5.18 in eve/,
gl/ and gui/;
- many new tutorials and demos for eve/;
- fix in TQObject to support class-signals from all base-classes.
Revision
21653 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Jan 11 20:23:15 2008 UTC (7 years ago) by
matevz
Original Path:
trunk/gl/src/TPointSet3DGL.cxx
File length: 3096 byte(s)
Diff to
previous 20882
Move code for rendering of poly-markers and poly-lines from TEveGLUtil
to TGLUtil and remove TEveGLUtil class.
Extend picking region also for fat lines so that lines can be picked
also on their edges not only at the very center.
Fix rendering of anitaliased points in TEveStraightLineSetGL.
Honour wireframe and outline modes in TEveTriangleSetGL.
Add new tutorial pointset_test.C.
Revision
19153 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Sat Jun 23 21:23:22 2007 UTC (7 years, 7 months ago) by
brun
Original Path:
trunk/gl/src/TPointSet3DGL.cxx
File length: 6628 byte(s)
Diff to
previous 19049
From Matevz:
1. TGLViewer performs internal loop on pad-primitives.
2. Timur: generalization of gl-plot-painters to allow external access.
3. Support usage of gl-plot-painters in gl-viewer.
4. Provide a default gl-sharing context for resource optimization.
Revision
19049 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Jun 18 07:02:16 2007 UTC (7 years, 7 months ago) by
brun
Original Path:
trunk/gl/src/TPointSet3DGL.cxx
File length: 6611 byte(s)
Diff to
previous 19000
From Matev and Timur:
Timur:
1. Allow unique identification of shared GL contexts via
TGLContextIdentity class.
Matevz:
1. Improved overlay selection handling.
2. Perform GL context check before rendering, possibly invalidating
registered display-lists.
3. Minimize updates for window expose and resize events.
Revision
19000 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Jun 11 19:56:34 2007 UTC (7 years, 7 months ago) by
brun
Original Path:
trunk/gl/src/TPointSet3DGL.cxx
File length: 6617 byte(s)
Diff to
previous 16090
From Matevz:
Major restructuring of GL viewer-scene relationship (Matevz)
===================================================
The main idea was to generalize current GL infrustructure so that the
following features can be done in the future:
1. Full pad rendering via GL including 3D histo/func painters and 2D graphics.
2. Implementation of GL canvas (with independent viewers serving as pads).
3. Multi-view event-visualization front-end.
4. Inclusion of external scenes (non-ROOT-gl) in ROOT viewer.
Rendering of ROOT scenes in external GL frameworks.
Changes on the code level
-------------------------
0. Extend current scene/viewer classes into a 2-level class hierarchy.
New classes TGLViewerBase and TGLSceneBase.
1. Allow scenes to be shared among viewers. View-specific scene-cache
needs to be kept at the viewer side.
2. Viewer now manages a list of scenes. It is possible to put together
a combination of scenes (e.g. one showing geometry, another one tracks
and yet another clusters). Each scene can define its own clipping object.
3. Provide API for fine-grained control over rendered object removal,
creation and update. This allows for efficient scene-updates.
4. Disentangle selection, clipping and other markup objects from
within viewer-scene singleton.
New classes TGLClipSet, TGLManipSet.
6. Disentangle selection management.
7. Separate overlay rendering to allow any number of active GL-GUI
elements (like manipulators are now).
New classes TGLOverlayElement.
8. Trailing white space has been removed in all files.
Restructure low-level interface to OpenGL (Timur)
=========================================
1. Allow sharing GL resources among viewers.
2. Do not bind GL-output (windowed or offscreen) to ROOT GUI.
New classes TGLContext, TGLFormat, TGLWidget.
This oboletes TGLKernel and TVirtualGL classes.
Revision
16090 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Aug 23 14:39:40 2006 UTC (8 years, 5 months ago) by
brun
Original Path:
trunk/gl/src/TPointSet3DGL.cxx
File length: 6261 byte(s)
Diff to
previous 14979
From Matevz Tadel:
1) Implementation of two-level (secondary) selection
Rendering objects can provide a new level of interactivity, for
example a TPointSet3D holding a set of clusters can attach a pointer
to original cluster to each point and receive notifications when a
specified cluster was clicked.
Secondary selection is activated by Control-Left clicking into the
GL window.
2) Improve control over camera-reset behaviour
Allow user to prevent camera reset on scene update and
double-click.
3) Improvements in TPointSet3D(GL)
Detailed ChangeLog
==================
* base/inc/TVirtualViewer3D.h:
Added virtual methods 'void ResetCameras(){}' and 'void
ResetCamerasAfterNextUpdate(){}'.
* gl/inc/TGLScene.h:
* gl/src/TGLScene.cxx:
Implemented two-level selection. It is enabled for next selection
pass by calling ActivateSecSelect().
DoSelect() does not change the selected object but only indicates
which object has been selected by setting new member
'TGLPhysicalShape *fSelectionResult'. Caller (TGLViewer) must call
new method 'void ApplySelection()' to actually change the selected
object to the last selection result.
Changed declaration of selection buffer from being a static varable
within DoSelect() to data-member. This allows post-processing of
selection records needed by two-level selection.
* gl/inc/TGLCamera.h:
* gl/inc/TGLOrthoCamera.h:
* gl/inc/TGLPerspectiveCamera.h:
* gl/src/TGLCamera.cxx:
* gl/src/TGLOrthoCamera.cxx:
* gl/src/TGLPerspectiveCamera.cxx:
Added Bool_t argument with default value to:
virtual void TGLCamera::Setup(const TGLBoundingBox & box, Bool_t
reset=kTRUE) = 0;
By setting it to false one can change camera parameters for new
scene bounding-box without repositioning the camera.
Added 'Bool_t checkSize' argument to OfInterest().
This is relevant for marker-classes which can have small
volume/length but are still visible as they are rendered in
pixel-coordinates. Value of this argument is needed in TGLScene
(DestroyPhysicals) and TGLViewer (AddObject). It is obtained by
calling virtual method TGLLogicalShape::IgnoreSizeForOfInterest().
This method returns false by defalut and is overriden in
TGLPolyMarker and TPointSet3DGL.
* gl/inc/TGLViewer.h:
* gl/src/TGLViewer.cxx:
Added controls for camera-reset behaviour.
Data-members: 'Bool_t fResetCamerasOnUpdate', 'Bool_t
fResetCamerasOnNextUpdate', 'Bool_t fResetCameraOnDoubleClick'.
Methods: 'ResetCameras()', 'ResetCamerasAfterNextUpdate()',
'ResetCurrentCamera()'.
Added an argument to 'void PostSceneBuildSetup(Bool_t resetCameras).
Added Bool_t return-value to RequestSelect(). It returns true if
result of the selection is different then fSelectedPhysical.
Added method ApplySelection() to interface with TGLScene
selection state. This is called from event-handling functions in
TGLViewer.
Added key-binding for 'Home': ResetCurrentCamera().
* gl/inc/TGLSAViewer.h:
* gl/src/TGLSAViewer.cxx:
Added description of new functionality to fgHelpText.
MSVC was complaining about fgHelpText being too long: I split it
into fgHelpText1 and fgHelpText2.
* gl/inc/TGLDrawFlags.h:
* gl/src/TGLDrawFlags.cxx:
Added members 'Bool_t fSelection' and 'Bool_t
fSecSelection' allowing passing of current selection state to
renderers. This is needed to allow different render-paths during
(secondary) selection.
We should consider passing TGLScene* and/or TGLViewer* down to
DirectDraw() of individual renderers.
* gl/src/TGLDrawable.cxx:
In ShouldCache() return false if secondary selection is in progress.
* gl/src/TGLPhysicalShape.cxx:
Handle new members in TGLDrawFlags.
* gl/inc/TGLLogicalShape.h:
* gl/src/TGLLogicalShape.cxx:
Added three new functions:
1) virtual Bool_t SupportsSecondarySelect() const { return kFALSE; }
This is called by TGLScene::DoSelect() to check is object that was
the result of primary selection supports secondary selection.
2) virtual void ProcessSelection(UInt_t* ptr, TGLViewer*, TGLScene*);
It is called back from TGLViewer after successful secondary
selection. As the object that does the rendering is the only one
that actually knows how the object sub-parts were named it has
to interpret the results.
Both of these should be overriden in classes that support
secondary selection, for example see TPointSet3DGL.
3) virtual Bool_t IgnoreSizeForOfInterest() const { return kFALSE; }
Signals to TGLScene and TGLViewer that volume/lenght of this
class' bounding box should not be considered when checking if
objects of this class are of interest to current camera.
* gl/inc/TGLObject.h:
* gl/src/TGLObject.cxx:
Changed second argument of function:
Bool_t SetModelCheckClass(TObject* obj, const Text_t* classname);
to 'TClass* cls'. This is much more efficient.
* g3d/inc/TPointSet3D.h:
* g3d/src/TPointSet3D.cxx:
Added support for per-point designations (one TObject* per point;
via casting it can be set to anything).
New virtual method 'void PointSelected(Int_t n)' that is called
back after successful secondary selection in TGLViewer (via
virtual TGLLogicalShape::ProcessSelection()).
* gl/inc/TPointSet3DGL.h:
* gl/src/TPointSet3DGL.cxx:
Added support for per-point selection. Point-sizes are taken into
account during selection (by modifying the projection
matrix).
Implemented 'virtual Bool_t TGLDrawable::ShouldCache()' to disable
caching when in primary selection (point-size improvements).
Cross-like marker types are now supported to some extent.
Improved structure of rendering code.
Override 'virtual Bool_t TGLLogicalShape::IgnoreSizeForOfInterest()'
to return true.
Multiply TAttMarker::GetMarkerSize() by 5 before applying.
* gl/inc/TGLPolyMarker.h:
Override 'virtual Bool_t TGLLogicalShape::IgnoreSizeForOfInterest()'
to return true.
Revision
14580 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Added
Fri Apr 7 08:43:59 2006 UTC (8 years, 9 months ago) by
brun
Original Path:
trunk/gl/src/TPointSet3DGL.cxx
File length: 1510 byte(s)
From Matevz Tadel:
Introduce a new set of classes dedicated to event visualisation.
TGLObject: base-class for direct GL renderers
TAttBBox: interface, helps maintain/calculate bounding-box
needed for TGLObject (see TPointSet3D and TPointSet3DGL)
TPointSet3D: a demo class for direct GL rendering
TPointSet3DGL:
Mods in existing classes to interface the new classes
This form allows you to request diffs between any two revisions of this file.
For each of the two "sides" of the diff,
enter a numeric revision.
