Log of /trunk/graf3d/eve/src/TEveProjectionAxesGL.cxx
Parent Directory
Revision
38721 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Apr 4 13:37:12 2011 UTC (3 years, 9 months ago) by
matevz
File length: 14138 byte(s)
Diff to
previous 36384
Merge the following revisions from branches/dev/fireworks:
37780, 37831, 38257, 38388, 38390, 38400, 38406, 38407, 38412, 38415,
38416, 38420, 38481
37780
=====
Author: alja
Date: Thu Jan 13 20:37:48 2011
New Revision: 37780
URL: http://root.cern.ch/viewvc?rev=37780&root=root&view=rev
Log:
Use double precision for track propagation.
TEveTrack, TEveTrackPropagator:
Change memebers for track propagation to use double types.
TEvePathMark:
Add copy constructor.
TEveVSDStructs:
Template TEveRecTrack for double and float types.
track.C:
Use TEveRecTrackD and TEvePathMarkD to avoid unnecessary float to double conversion.
Replace virtual TEveMagField::GetFieldD() with TEveMagField::GetField() to avoid float to
double conversion.
Modified:
branches/dev/fireworks/graf3d/eve/inc/LinkDef1.h
branches/dev/fireworks/graf3d/eve/inc/TEvePathMark.h
branches/dev/fireworks/graf3d/eve/inc/TEveTrack.h
branches/dev/fireworks/graf3d/eve/inc/TEveTrackPropagator.h
branches/dev/fireworks/graf3d/eve/inc/TEveVSDStructs.h
branches/dev/fireworks/graf3d/eve/src/TEveTrack.cxx
branches/dev/fireworks/graf3d/eve/src/TEveTrackGL.cxx
branches/dev/fireworks/graf3d/eve/src/TEveTrackProjected.cxx
branches/dev/fireworks/graf3d/eve/src/TEveTrackPropagator.cxx
branches/dev/fireworks/graf3d/eve/src/TEveVSDStructs.cxx
branches/dev/fireworks/tutorials/eve/track.C
37831
=====
Author: alja
Date: Fri Jan 21 14:52:01 2011
New Revision: 37831
URL: http://root.cern.ch/viewvc?rev=37831&root=root&view=rev
Log:
Fix 3D-axis font size when TEveCaloData is empty.
Read axis divisions from x,y axis.
Modified:
branches/dev/fireworks/graf3d/eve/src/TEveCaloLegoGL.cxx
38257
=====
Author: alja
Date: Tue Mar 1 15:34:36 2011
New Revision: 38257
URL: http://root.cern.ch/viewvc?rev=38257&root=root&view=rev
Log:
Fix pick camera-center when depth test is disabled.
Modified:
branches/dev/fireworks/graf3d/eve/src/TEveStraightLineSetGL.cxx
38388
=====
Author: alja
Date: Fri Mar 11 17:45:41 2011
New Revision: 38388
URL: http://root.cern.ch/viewvc?rev=38388&root=root&view=rev
Log:
Add option fDisplaceCenter to dismiss empty gap in RhoZ projection when projection center is not in
origin:
In ProjectPoint(), if fDisplaceCenter falg is set, move input vertex before projecting its coordinates.
Modified:
branches/dev/fireworks/graf3d/eve/inc/TEveProjections.h
branches/dev/fireworks/graf3d/eve/src/TEveProjections.cxx
38390
=====
Author: alja
Date: Fri Mar 11 17:58:55 2011
New Revision: 38390
URL: http://root.cern.ch/viewvc?rev=38390&root=root&view=rev
Log:
Set label size from TAttAxis.
Catch TEveException in DirectDraw().
Modified:
branches/dev/fireworks/graf3d/eve/src/TEveProjectionAxesGL.cxx
38400
=====
Author: alja
Date: Mon Mar 14 18:36:02 2011
New Revision: 38400
URL: http://root.cern.ch/viewvc?rev=38400&root=root&view=rev
Log:
TEveProjectionAxesGL:
Set axis range by comparing frustum size and projection manager bounding box.
TEveProjections:
Set function GetLimit(), previously used by TEveProjectionAxesGL, obsolete.
Modified:
branches/dev/fireworks/graf3d/eve/inc/TEveProjections.h
branches/dev/fireworks/graf3d/eve/src/TEveProjectionAxesGL.cxx
branches/dev/fireworks/graf3d/eve/src/TEveProjections.cxx
38406
=====
Author: alja
Date: Mon Mar 14 22:09:04 2011
New Revision: 38406
URL: http://root.cern.ch/viewvc?rev=38406&root=root&view=rev
Log:
Update projected center in SetCenter() function.
Modified:
branches/dev/fireworks/graf3d/eve/inc/TEveProjections.h
branches/dev/fireworks/graf3d/eve/src/TEveProjections.cxx
38407
=====
Author: alja
Date: Mon Mar 14 22:17:34 2011
New Revision: 38407
URL: http://root.cern.ch/viewvc?rev=38407&root=root&view=rev
Log:
Rename memeber fDisplaceCenter to fDisplaceOrigin.
Modified:
branches/dev/fireworks/graf3d/eve/inc/TEveProjections.h
branches/dev/fireworks/graf3d/eve/src/TEveProjections.cxx
38412
=====
Author: alja
Date: Tue Mar 15 15:48:55 2011
New Revision: 38412
URL: http://root.cern.ch/viewvc?rev=38412&root=root&view=rev
Log:
Fix GetValForScreenPos(), used by TEveProjectionAxis, to return non-displaced/oroginal value
in displace-origin mode.x
Modified:
branches/dev/fireworks/graf3d/eve/inc/TEveProjections.h
branches/dev/fireworks/graf3d/eve/src/TEveProjections.cxx
38415
=====
Author: alja
Date: Tue Mar 15 15:54:02 2011
New Revision: 38415
URL: http://root.cern.ch/viewvc?rev=38415&root=root&view=rev
Log:
Cache values in SplitIntervalByPos() for optimization.
Modified:
branches/dev/fireworks/graf3d/eve/src/TEveProjectionAxesGL.cxx
38416
=====
Author: alja
Date: Tue Mar 15 16:03:28 2011
New Revision: 38416
URL: http://root.cern.ch/viewvc?rev=38416&root=root&view=rev
Log:
Add define TEVEPROJECTIONS_DISPLACE_ORIGIN_MODE as temporary workaround till root
patches are integrated to CMSSW.
Modified:
branches/dev/fireworks/graf3d/eve/inc/TEveProjections.h
38420
=====
Author: alja
Date: Tue Mar 15 20:27:41 2011
New Revision: 38420
URL: http://root.cern.ch/viewvc?rev=38420&root=root&view=rev
Log:
Changes in GetValForScreenPos() used by TEveProjectionAxes:
return shifted value in case origin is displaced.
Modified:
branches/dev/fireworks/graf3d/eve/src/TEveProjections.cxx
38481
=====
Author: alja
Date: Thu Mar 17 13:11:34 2011
New Revision: 38481
URL: http://root.cern.ch/viewvc?rev=38481&root=root&view=rev
Log:
In TEvecalo2D add getter for sorted cell lists.
Modified:
branches/dev/fireworks/graf3d/eve/inc/TEveCalo.h
Revision
35013 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Aug 25 14:28:19 2010 UTC (4 years, 5 months ago) by
matevz
File length: 13660 byte(s)
Diff to
previous 34984
Revert revs 34948 34983 34984 -- unnecessary initializations of local variables passed by reference as output parameter to THLimitsFinder::Optimize().
Revision
30840 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Oct 23 09:03:14 2009 UTC (5 years, 3 months ago) by
matevz
File length: 13645 byte(s)
Diff to
previous 30545
Add support for 3D -> 3D projections. This also allows for
scaling (compression/extension) of certain space region as required by
NA62 to show the 200m long detector in a meaningful way.
Several generalizations of the projection infrastructure were
required:
1. TEveProjectable::ProjectedClass() takes an argument:
virtual TClass* ProjectedClass(const TEveProjection* p) const = 0;
thus allowing different projected classes for different projections.
2. All TEveProjection::ProjectPoint/Vector(...) functions have an
additional "depth" argument thus allowing the projected classes to
skip explicit setting of depth after the point has been projected
-- this could damage the 3rd component.
Pre-scaling now supports 3 dimensions.
3. Abstract TEveProjected::SetDepth() has been split into two parts:
a) It has been implemented in the base class where it checks for
the projection type (2d) before calling the local function;
b) Abstract SetDepthLocal() has been added to provide the same
functionality.
This allows for the 2d/3d check to be done in place only.
4. New projection class has been introduced: TEve3DProjection.
It performs pre-scaling and offsets the center.
5. To simplify the projection of lists TEveElementList has been made
projectable and corresponding TEveElementListProjected class
introduced. This also fixed the problem with render-state not being
propagated to projected classes.
The check whether to project a sub-tree of elements is still performed.
6. TEveGeoShapeProjected has been introduced to represent the 3D
projection of a TEveGeoShape (2D projection is handled by
TEvePolygonSetProjected).
Points, lines and tracks use the same projected class for both 2D
and 3D projections.
An example showing this functionality has been added as a new tab in
tutorials/eve/projection_prescale.C.
Revision
30545 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Oct 2 16:24:12 2009 UTC (5 years, 3 months ago) by
matevz
File length: 13642 byte(s)
Diff to
previous 30418
From Alja.
calorimeters.C:
Set light color-set.
TEveCaloLegoGL.cxx:
Bugfix: check rebin step not to exceed nuber of bins.
TEveProjectionAxes:
Use Pixmap font as a defult, since it look better at small sizes.
For example case window is docked.
TGLAnnotation:
Add option to use color-set values. Add setters and getters.
Revision
30418 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Sep 24 17:10:11 2009 UTC (5 years, 4 months ago) by
matevz
File length: 13592 byte(s)
Diff to
previous 30384
From Alja.
GLRnrCtx:
Add possibility for automatic font scaling.
TGLFontManager:
In RegisterFont() check if font state has changed and check valid font size. Before,
this checks were done in the renders.
render classes:
Use optionally scaled or non-scaled fonts. Remove checks for FTGL fonts,
since they are now done in TGLFontManager:RegisterFont().
Revision
30384 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Sep 23 17:54:23 2009 UTC (5 years, 4 months ago) by
matevz
File length: 13528 byte(s)
Diff to
previous 28197
Merge from fworks branch the following revisions:
30297
=====
tutorials/eve/cms_calo.C:
Change elements names.
TGLViewer:
Add getter to see if use bright or dark colorset.
TGLCameraOverlay, TEveCaloLego, TEveProjectionAxes,TEveCaloLegoOverlay:
By default use markup colors from color set. This way color will be correct
in bright and dark background without any settings.
30340
=====
TEveViewer:
Protect against misleading warnings (happened on mac only).
30376
=====
TGLFont:
Remove TGLFont::RenderBitmap() function and replace it with TGLFont::Render(),
which can be used more genericaly: for all font types and alignments.
TGLAxisPainter, TGLCameraOverlay, TGLAnnotation, TEveProjectionAxesGL:
Use TGLFont::Render() function to draw labels and titles.
TEveCaloLego, TEveCaloLegoEditor:
Remove obsolete members fTopViewUseMaxColor and fTopViewTowerColor.
TEveCaloLegoGL:
Draw tower vlues in all 2DModes.
TEveCaloLegoOverlay:
Draw palette scales in case TEveCaloLego is using palette (f2DMode = TEveCaloLego::kValColor).
TEveCalo3DGL:
Keep grid color same in outline and wirewrame render mode.
Revision
28197 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Tue Apr 14 13:59:27 2009 UTC (5 years, 9 months ago) by
matevz
File length: 13411 byte(s)
Diff to
previous 27643
Merge the following revisions from the fireworks branch:
-r 27692:27867
-c 27876
-r 28012:28187
================================================================================
27693
TEveCalo:
Set bounding box when calo data empty.
TEveCaloLegoGL:
TGLAxisPainter:
Draw axis title in TGLAxisPainter::PaintAxis().
--------------------------------------------------------------------------------
27694
Forget to check-in this file in revision 27693.
--------------------------------------------------------------------------------
27695
Don't draw frame and call TGLAxisPainter::Paint() if calo data empty.
--------------------------------------------------------------------------------
27699
Fix issues reported by valgrind.
--------------------------------------------------------------------------------
27758
Return viewer in TEveViewer::SpawnGLViewer and TEveViewer::SpawnGLEmbeddedViewer().
--------------------------------------------------------------------------------
27767
Unset event handler when destroying TGLWidget. This is important in case destruction of TGLWidget is called with timeout.
--------------------------------------------------------------------------------
27840
Add possibility to create different icon boxes in
TEveCompositeFrame. Use static function pointer fgIconBarCreator to change default behavior.
Remove oboslete function TEveCompositeFrame::ReplaceIconBox().
--------------------------------------------------------------------------------
7856
Bug fix: Get font size calculating projected axis length at the Z-title position.
--------------------------------------------------------------------------------
27857
Move to real world coordinates. Add line-set for test.
--------------------------------------------------------------------------------
27867
TGLViewer:
Add function:
void ResetInitGL()
This is needed if GL-context is destroyed from outside.
Call it from derived classes when creating and destroying GL-widget.
--------------------------------------------------------------------------------
27876
In line set add possibility to disable depth test, i.e. draw lines/markers in front.
--------------------------------------------------------------------------------
28013
Fix memory leak in TEveCalo2D.
--------------------------------------------------------------------------------
28048
In HandleCrossing() ignore grab and ungrab events. Several window managers produce them nowadays (fvwm2, x-on-mac, sawfish).
--------------------------------------------------------------------------------
28050
Simplify macro.
--------------------------------------------------------------------------------
28106
URL: http://root.cern.ch/viewcvs?rev=28106&root=root&view=rev
Log:
Add data-members and accessors for controlling brightness of front,
side and speulcar lights.
--------------------------------------------------------------------------------
28114
TGLPShapeObjEditor
==================
Remove obsolete data-members and enum entries.
TGLUtil
=======
New class TGLColor - using this will simplify color management in
TGLViewer and TGLRnrCtx.
TEveUtil
========
Simplify implementation of TEveUtil::ColorFromIdx() functions.
--------------------------------------------------------------------------------
28144
Add dtor for TGLColor.
--------------------------------------------------------------------------------
28161
URL: http://root.cern.ch/viewcvs?rev=28161&root=root&view=rev
Log:
Extend window management demo.
--------------------------------------------------------------------------------
28162
Add support several GL color-sets - each defines colors for background,
foreground, outline, markup and for outlines of selected and
highlighted objects.
GL/
===
TGLUtil - add new class TGLColorSet.
TGLRnrCtx - add color-set stack.
TGLViewer - create two color-sets by default - for light and dark
background. These can be switched with the 'e' key now.
TGLScene - decrease polgon-offset for outline-mode fill-pass from (1,
1) to (0.5, 0.5) which is sufficient.
Use/support color-set functionality in other modified classes.
EVE/
====
TEvePolygonSetProjectedGL - skip outline pass.
TEveProjectionAxesGL - skip outline pass and slightly widen the depth
range so that the text is visible in outline mode, where
polygon-offset is applied during the fill-pass.
--------------------------------------------------------------------------------
28168
Add support for a global GL color-set shared among several (all)
viewers.
TGLViewer - add static data-members and functions to handle global
color-set. Add methods that allow switching between global/private
color-sets for a given viewer.
TGLViewerEditor - Disable backgound-color widget when the viewer uses
global color-set.
TGLCameraOverlay - use foreground color for some markup rendering.
In two tutorials use the new API for setting of the background color.
--------------------------------------------------------------------------------
28187
Put back the old method for setting background color and mark it as deprecated.
Revision
27643 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Feb 27 16:13:24 2009 UTC (5 years, 10 months ago) by
matevz
File length: 12849 byte(s)
Diff to
previous 27500
From Alja.
graf3d/gl/src/TGLAxisPainter.cxx,
graf3d/gl/inc/TGLAxisPainter.h:
Add possibility to render axis with any FTGL font mode. Before only pixmap and bitmap fonts were supported.
graf3d/gl/src/TGLFontManager.cxx:
Check if static table is initialised in TGLFontManager::GetFontNameFromId().
graf3d/gl/src/TGLCameraOverlay.cxx,
graf3d/gl/inc/TGLCameraOverlay.h:
Use FTGL font directly in kBar and kPlaneIntersect overlay mode.
graf3d/eve/src/TEveProjectionAxes.cxx:
Set axis attributes.
graf3d/eve/src/TEveProjectionAxesGL.cxx,
graf3d/eve/src/TEveCaloLegoOverlay.cxx,
graf3d/eve/inc/TEveCaloLegoOverlay.h,
Render axis with texture font.
Revision
27370 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Feb 6 18:58:23 2009 UTC (5 years, 11 months ago) by
matevz
File length: 12723 byte(s)
Diff to
previous 27341
graf3d/gl/src/TGLAxisPainter.cxx:
Fix last tick-mark position.
graf3d/gl/src/TGLCameraOverlay.cxx,
graf3d/gl/inc/TGLCameraOverlay.h:
Set font size and tick length relative to size of viewport diagonal.
graf3d/eve/src/TEveCaloLegoOverlay.cxx:
graf3d/eve/src/TEveLegoOverlay.cxx:
graf3d/eve/inc/TEveLegoOverlay.h:
graf3d/eve/inc/TEveCaloLegoOverlay.h:
graf3d/eve/inc/LinkDef2.h:
graf3d/eve/Module.mk:
Rename class TEveLegoOverlay to TEveCaloLegoOverlay, since this is overlay rendering calorimeter parameters.
graf3d/eve/inc/TEveCaloLegoGL.h:
graf3d/eve/src/TEveCaloLegoGL.cxx:
Small bug fix in z-axis tick marks offset. Render axes in 2D
differently than in 3D.
graf3d/eve/src/TEveProjectionAxesGL.cxx:
graf3d/eve/src/TEveProjectionAxes.cxx:
Set axis range relative to viewport size not relative to bounding box
of projection manager as before. Use viewport diagonal as a main reference to set tick length and font size.
graf3d/eve/src/TEveProjectionAxes.cxx:
Change default tick length.
tutorials/eve/cms_calo.C:
tutorials/eve/cms_calo_detail.C:
Adopt to changes in the source code.
Revision
27341 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Tue Feb 3 19:47:35 2009 UTC (5 years, 11 months ago) by
matevz
File length: 13170 byte(s)
Diff to
previous 26367
From Alja.
graf3d/gl/src/TGLAxisPainter.cxx,
graf3d/gl/inc/TGLAxisPainter.h:
Reimplement GL rendering of axis. Calculation of labels val-positions
and tick-marks is separated from the rendering code. The painter has
now possibility to render TAxis directly or render given list of label position-value pairs.
graf3d/gl/inc/LinkDef.h:
Remove obsolete class TGLAttAxis, which have been used by TGLAxisPainter.
graf3d/gl/src/TGLFontManager.cxx:
Use same indexing of font names as in graf2d rendering of axis.
graf3d/gl/inc/TGLCameraOverlay.h,
graf3d/gl/src/TGLCameraOverlay.cxx,
graf3d/eve/src/TEveProjectionAxes.cxx,
graf3d/eve/inc/TEveProjectionAxes.h,
graf3d/eve/inc/TEveProjectionAxesGL.h,
graf3d/eve/src/TEveProjectionAxesGL.cxx,
graf3d/eve/inc/TEveLegoOverlay.h,
graf3d/eve/src/TEveLegoOverlay.cxx,
graf3d/eve/inc/TEveCaloLegoGL.h
graf3d/eve/src/TEveCaloLegoGL.cxx,
Use new implementation of TGLAxisPainter.
graf3d/eve/inc/TEveProjectionAxesEditor.h,
graf3d/eve/src/TEveProjectionAxesEditor.cxx:
Remove obsolete widgets since TEveProjectionAxes inherit from TAttAxis.
graf3d/eve/src/TEveCalo.cxx:
Bugfix. Check if RGBAPalette is created when switching E/Et.
Revision
26367 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Nov 21 18:08:30 2008 UTC (6 years, 2 months ago) by
matevz
File length: 13487 byte(s)
Diff to
previous 25905
Merge revisions 26280:26327 from the fireworks branch.
26281
=====
- TGLScenePad: replace static variable with a data-member. Fix comments.
26304
=====
- TEveProjectionAxesGL: fix index out of bounds error reported by valgrind.
26306
=====
- TGLScene, TGLScenePad: better comments, consistent whitespace.
- TEveElement: add method DestroyOrWarn(): original Destroy() method is exception throwing.
- TEveScene: delete GL-scene and pad in destructor; add ownership information to class-docs.
- TEveSceneList: add method DestroyScenes().
- TEveViewer: add ownership information to class-docs.
- TEveManager: delete scenes, scene-list, viewers and viewer-list in destructor.
26325
=====
TEveTrackPropagator: implement the following overrides of virtual functions:
- TEveElement::CheckReferenceCount() - take into account references from TEveRefBackPtr;
- TEveRefBackPtr::OnZeroRefCount() - call CheckReferenceCount().
26327
=====
Remove trailing whitespace in eve/ and gl/.
Revision
25899 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Oct 20 20:13:38 2008 UTC (6 years, 3 months ago) by
matevz
File length: 13392 byte(s)
Diff to
previous 25881
TEveProjectionAxesGL:
Add possibility to draw projection center and scene origin.
TEveProjectionAxes.h:
Set short description.
TGLAxisPainter.cxx:
Fix typo in documentation.
TGLCameraOverlay.cxx:
Fix viewport range.
Revision
25881 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Oct 20 11:29:52 2008 UTC (6 years, 3 months ago) by
matevz
File length: 12002 byte(s)
Diff to
previous 25661
Merge rev 25880 from the fireworks branch.
TEveUtil.cxx:
Bug fix in GetFraction().
TGLFontManager.cxx, TEveProjectionAxesGL.cxx:
Fix left and right text alignement.
TEveLegoOverlay.cxx, TEveLegoOverlay.h:
Use TEveElement main color to color axis labels and lines.
TGLCameraOverlay.h, TGLCameraOverlay.cxx:
Fix random one pixel offset when rendering axis on the viewport
edges. Structural improvements.
tutorials/eve/cms_calo.C:
Show reference plane in TEveLegoOverlay object.
Revision
25642 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Oct 1 11:04:06 2008 UTC (6 years, 3 months ago) by
matevz
File length: 11996 byte(s)
Diff to
previous 25431
Merge revs 25435:25641 from the fireworks branch.
Many improvements in text and axis rendering for orthographic views,
for axes in non-linear projections and for the dedicated lego view.
TGLSceneBase
------------
Add data-member 'Bool_t fSelectable' with get/set methods.
If this is set to false, the scene is not rendered during selection
thus preventing any of its elements to be selected.
TGLViewerBase
-------------
In PreRender() honour the selectable state of a scene when selecting
which scenes to include in rendering.
TGLSAViewer
-----------
Remove extra border introduced by usage of kSunkenFrame.
TGLEmbeddedViewer
-----------------
Add optional argument 'Int_t border' to the constructor.
Revision
25431 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Sep 17 08:35:34 2008 UTC (6 years, 4 months ago) by
matevz
File length: 8216 byte(s)
Diff to
previous 25275
Merge Alja's development since the release from the fireworks branch.
25284
-----
TEveCaloLegoGL, TGLAxisPainter, TGLCameraOverlay:
Fix tick-mark and font offsets.
25291
-----
TGLViewerEditor, TGLViewer, TGLCamera, TGLOrthoCamera,
TGLCameraOverlay, LinkDef.h:
Remove TGLCameraMarkupStyle. Functionality is moved to TGLCameraOverlay.
TGLFontManager:
Add utility function TGLFont::RenderBitmap() to draw pixmap
and bitmap fonts on given location.
TEveProjectionAxesGL:
Use TGLFont::RenderBitmap() function.
cms_calo.C, projection_test_prescale.C, projection_test.C, test_compound.C:
Camera markup is not drawn by default in orthographic projection.
25319
-----
TGLCameraOverlay.cxx:
Fix gl pick matrix.
TEveLegoOverlay:
Move inheritance from TGLOverlayElement to TGLCameraOverlay.
25395
-----
TGLFontManager, TGLAxisPainter, TGLCameraOverlay,TEveLegoOverlay, TEveCaloLegoGL:
Modify utility function TGLFont::RenderBitmap() to render text with given alignment.
TEveProjectionAxes:
Render axis on the edges of viewport instead of on edges of bounding box.
25405
-----
TEveProjectionAxesGL:
Draw axis from start to end of frustum corners if frustum inside projection limits,
else draw axis from low to high projection limit.
Set tick-mark size relative to viewport size.
Revision
25245 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Aug 25 21:44:09 2008 UTC (6 years, 4 months ago) by
matevz
File length: 10221 byte(s)
Diff to
previous 24214
Merge changes from the eve-dev branch (-r 25202:HEAD). This makes trunk up to date with all developments in eve/ and gl/. eve-dev branch is now obsolete and will be removed.
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: 9115 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: 9082 byte(s)
Diff to
previous 23087
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
23087 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Apr 9 14:10:56 2008 UTC (6 years, 9 months ago) by
rdm
Original Path:
trunk/eve/src/TEveProjectionAxesGL.cxx
File length: 9082 byte(s)
Diff to
previous 22539
From Alja, Bertrand and Matevz - merged branches/dev/fireworks 22550:23082.
Major changes imported by this merge are:
gl/
====
- reorganization of scene rendering in TGLViewer - render opaque
objects from all scenes first, then all transparent ones;
- improve saving of images from the GL-viewer so that the dialog boxes
and other windows do not result in black areas on the saved image;
- improved management of FTGL fonts accross GL contexts.
eve/
====
- new classes for visualization of calorimeter data in lego mode;
- allow fixed scale beyond given radius for fish-eye projections.
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/eve/src/TEveProjectionAxesGL.cxx
File length: 9568 byte(s)
Diff to
previous 21888
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
21881 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Added
Mon Jan 28 16:24:14 2008 UTC (6 years, 11 months ago) by
matevz
Original Path:
trunk/eve/src/TEveProjectionAxesGL.cxx
File length: 10451 byte(s)
From Alja:
Move rendering of axes from TEveProjectionManager to new class
TEveProjectionAxes. Use TEveText functionality for rendering of
tick-mark labels.
Add new members for FTFont configuration in TEveText.
New demo: tutorials/eve/projection_test.C.
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.
