Log of /trunk/graf3d/gl/inc/TGLOverlay.h
Parent Directory
Revision
34006 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Jun 21 10:36:05 2010 UTC (4 years, 7 months ago) by
matevz
File length: 2568 byte(s)
Diff to
previous 28885
Merge the following revisions from branches/dev/fireworks:
33974, 33980, 33983, 33984, 33994
33974
=====
Author: alja
Date: Thu Jun 17 22:12:00 2010
New Revision: 33974
URL: http://root.cern.ch/viewvc?rev=33974&root=root&view=rev
Log:
TEveCaloLegoGL:
Fix picking of rebinned 3D towers.
TEveCalo3DGL:
Fix highlight rendering.
Modified:
branches/dev/fireworks/graf3d/eve/src/TEveCalo3DGL.cxx
branches/dev/fireworks/graf3d/eve/src/TEveCaloLegoGL.cxx
33980
=====
Author: matevz
Date: Fri Jun 18 18:30:34 2010
New Revision: 33980
URL: http://root.cern.ch/viewvc?rev=33980&root=root&view=rev
Log:
* TGLOverlayElement
Add state enum member to allow:
- hiding of overlay elements;
- preventing overlay events to reach them.
TGLViewerBase::RenderOverlay() not takes bitfield of states that
should be drawn.
* TGLCameraGuide
New overlay element showing axis orientation.
* TGLRnrCtx
Introduce standard functions to setup projection matrix for 2D /
screen based operations and properly applying the selection matrix
when it is active, too:
void ProjectionMatrixPushIdentity();
void ProjectionMatrixPop();
* TGLUtil
Cleanup usage of static float arrays in surroundings of TGLUtil.
Added:
branches/dev/fireworks/graf3d/gl/inc/TGLCameraGuide.h (with props)
branches/dev/fireworks/graf3d/gl/src/TGLCameraGuide.cxx (with props)
Modified:
branches/dev/fireworks/graf3d/gl/inc/LinkDef.h
branches/dev/fireworks/graf3d/gl/inc/TGLCamera.h
branches/dev/fireworks/graf3d/gl/inc/TGLManip.h
branches/dev/fireworks/graf3d/gl/inc/TGLOverlay.h
branches/dev/fireworks/graf3d/gl/inc/TGLRnrCtx.h
branches/dev/fireworks/graf3d/gl/inc/TGLUtil.h
branches/dev/fireworks/graf3d/gl/inc/TGLViewerBase.h
branches/dev/fireworks/graf3d/gl/src/TGLAnnotation.cxx
branches/dev/fireworks/graf3d/gl/src/TGLLightSet.cxx
branches/dev/fireworks/graf3d/gl/src/TGLManip.cxx
branches/dev/fireworks/graf3d/gl/src/TGLRnrCtx.cxx
branches/dev/fireworks/graf3d/gl/src/TGLRotateManip.cxx
branches/dev/fireworks/graf3d/gl/src/TGLScaleManip.cxx
branches/dev/fireworks/graf3d/gl/src/TGLTransManip.cxx
branches/dev/fireworks/graf3d/gl/src/TGLUtil.cxx
branches/dev/fireworks/graf3d/gl/src/TGLViewer.cxx
branches/dev/fireworks/graf3d/gl/src/TGLViewerBase.cxx
Propchange: branches/dev/fireworks/graf3d/gl/inc/TGLCameraGuide.h
('svn:eol-style' added)
Propchange: branches/dev/fireworks/graf3d/gl/inc/TGLCameraGuide.h
('svn:keywords' added)
Propchange: branches/dev/fireworks/graf3d/gl/src/TGLCameraGuide.cxx
('svn:eol-style' added)
Propchange: branches/dev/fireworks/graf3d/gl/src/TGLCameraGuide.cxx
('svn:keywords' added)
33983
=====
Author: matevz
Date: Fri Jun 18 19:19:47 2010
New Revision: 33983
URL: http://root.cern.ch/viewvc?rev=33983&root=root&view=rev
Log:
Add on/off state setter void SetBinaryState(Bool_t).
Modified:
branches/dev/fireworks/graf3d/gl/inc/TGLOverlay.h
33984
=====
Author: matevz
Date: Fri Jun 18 19:35:51 2010
New Revision: 33984
URL: http://root.cern.ch/viewvc?rev=33984&root=root&view=rev
Log:
Replace logical and with binary one.
Modified:
branches/dev/fireworks/graf3d/gl/src/TGLViewerBase.cxx
33994
=====
Author: matevz
Date: Sat Jun 19 14:09:04 2010
New Revision: 33994
URL: http://root.cern.ch/viewvc?rev=33994&root=root&view=rev
Log:
Add 3 new data-members to control mouse/arrow key handling:
Float_t fArrowKeyFactor;
Float_t fMouseDragFactor;
Float_t fMouseWheelFactor;
These are take from rootrc, eg:
OpenGL.EventHandler.ViewerCentricControls: 1
OpenGL.EventHandler.ArrowKeyFactor: -1.0
OpenGL.EventHandler.MouseDragFactor: -1.0
OpenGL.EventHandler.MouseWheelFactor: -1.0
Modified:
branches/dev/fireworks/graf3d/gl/inc/TGLEventHandler.h
branches/dev/fireworks/graf3d/gl/src/TGLEventHandler.cxx
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: 1977 byte(s)
Diff to
previous 21812
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
21812 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Tue Jan 22 20:52:31 2008 UTC (7 years ago) by
matevz
Original Path:
trunk/gl/inc/TGLOverlay.h
File length: 1977 byte(s)
Diff to
previous 20882
From Alja:
New class TFTGLManager for management of FTGL fonts.
New classes TEveText, TEveTextEditor and TEveTextGL for display and
configuration of a 3D text.
New test macro 'tutorials/eve/text_test.C'.
From Matevz:
Reenable smart-refresh during redraw of TEveScenes.
Minor code-layout changes.
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/inc/TGLOverlay.h
File length: 2023 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]
Added
Mon Jun 11 19:56:34 2007 UTC (7 years, 7 months ago) by
brun
Original Path:
trunk/gl/inc/TGLOverlay.h
File length: 1906 byte(s)
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.
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.
