OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-03 17:56:21 +03:00
Code Packages Releases Activity

0025789: Visualization - get rid of obsolete 2d layers implementation

Browse Source 
Classes Aspect_Clayer2d,OpenGl_GrahpicDriver_Layer, Visual3d_Layer, Visual3d_LayerItem, V3d_LayerMgr, V3d_LayerMgrPointer were deleted. Method OpenGl_GraphicDriver::TextSize() was moved to OpenGl_GraphicDriver.cxx.

Update V3d/FILES

Documentation updated.
This commit is contained in:
isz 2015-09-03 14:52:01 +03:00 committed by bugmaster
parent 47e9c17868
commit 27f850863b
41 changed files with 146 additions and 1959 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
dox/dev_guides/upgrade/upgrade.md
View File

@ -385,3 +385,52 @@ TCollection_Array1OfReal aValues = ...;
std::stable_sort (aValues->begin(), aValues->end());
~~~~~
@subsection upgrade_occt700_2dlayers New implementation of 2d-layers
In latest OCCT version API that provided old implementation of 2d-layers was removed. Classes Aspect_Clayer2d, OpenGl_GrahpicDriver_Layer, Visual3d_Layer, Visual3d_LayerItem, V3d_LayerMgr, V3d_LayerMgrPointer were deleted.
Now 2d-layers are implemented through Z-layers. In order to create a 2d-object it is necessary to follow several steps:
1. Create an AIS interactive object
2. Set a Z-layer for it to determine in which layer this object will be displayed (layer system provides order of displaying objects, ones in the lower layer will be displayed behind the others in the higher layer)
3. Set transform persistence (flag Graphic3d_TMF_2d or Graphic3d_TMF_2d_IsTopDown and a gp_Pnt point, where X and Y are used to set the coordinates’ origin in 2d space of the view and Z coordinate defines the gap from border of view window, except center position)
One more feature of new 2d-layers imlementation is a ColorScale based on a new class AIS_ColorScale. Old implementation of ColorScale as a global property of V3d_View has been removed with associated methods V3d_View::ColorScaleDisplay(), V3d_View::ColorScaleErase(), V3d_View::ColorScaleIsDisplayed(), V3d_View::ColorScale() and classes V3d_ColorScale, V3d_ColorScaleLayerItem, Aspect_ColorScale.
New interactive object AIS_ColorScale provides the same configuration API as previously Aspect_ColorScale and V3d_ColorScale. It should be used in the following way to display a 2D presentation of ColorScale:
~~~~~
Handle(AIS_ColorScale) aCS = new AIS_ColorScale();
// configuring
aCS->SetHeight (0.95);
aCS->SetRange (0.0, 10.0);
aCS->SetNumberOfIntervals (10);
// displaying
aCS->SetZLayer (Graphic3d_ZLayerId_TopOSD);
aCS->SetTransformPersistence (Graphic3d_TMF_2d, gp_Pnt (-1,-1,0));
aCS->SetToUpdate();
theContextAIS->Display (aCS);
~~~~~
To see how 2d objects are realized in OCCT you can call draw commands vcolorscale, vlayerline or vdrawtext (with -2d option). Draw command vcolorscale now requires a name of ColorScale object as an argument. To display this object use command vdisplay. Example:
~~~~~
pload VISUALIZATION
vinit
vcolorscale cs –demo
pload MODELING
box b 100 100 100
vdisplay b
vsetdispmode 1
vfit
vlayerline 0 300 300 300 10
vdrawtext t "2D-TEXT" -2d -pos 0 150 0 -color red
~~~~~
Here is a small example in c++ how to display a custom AIS object in 2d:
~~~~~
Handle(AIS_InteractiveContext) aContext = ...; //get AIS context
Handle(AIS_InteractiveObject) anObj =...; //create an AIS object
anObj->SetZLayer(Graphic3d_ZLayerId_TopOSD); //display object in overlay
anObj->SetTransformPersistence (Graphic3d_TMF_2d, gp_Pnt (-1,-1,0)); //set 2d flag, coordinate origin is set to down-left corner
aContext->Display (anObj); //display the object
~~~~~

28
src/Aspect/Aspect_CLayer2d.hxx
View File

@ -1,28 +0,0 @@
// Copyright (c) 1999-2014 OPEN CASCADE SAS
//
// This file is part of Open CASCADE Technology software library.
//
// This library is free software; you can redistribute it and/or modify it under
// the terms of the GNU Lesser General Public License version 2.1 as published
// by the Free Software Foundation, with special exception defined in the file
// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
// distribution for complete text of the license and disclaimer of any warranty.
//
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
/*============================================================================*/
/*==== Titre: Aspect_CLayer2d.hxx */
/*==== Role : The header file of primitive type "CLayer2d" from Aspect */
/*==== */
/*==== Implementation: This is a primitive type implemented with typedef */
/*============================================================================*/
// Defines the C structure <alayer>
#ifndef _Aspect_CLayer2d_HeaderFile
#define _Aspect_CLayer2d_HeaderFile
#include <InterfaceGraphic_Aspect.hxx>
typedef CALL_DEF_LAYER Aspect_CLayer2d;
#endif /*Aspect_CLayer2d_HeaderFile*/

1
src/Aspect/FILES
View File

@ -12,7 +12,6 @@ Aspect_Background.hxx
Aspect_BadAccess.hxx
Aspect_CircularGrid.cxx
Aspect_CircularGrid.hxx
Aspect_CLayer2d.hxx
Aspect_Convert.hxx
Aspect_Display.hxx
Aspect_DisplayConnection.cxx

14
src/D3DHost/D3DHost_Workspace.cxx
View File

@ -262,9 +262,7 @@ bool D3DHost_Workspace::d3dSwap()
// function : Redraw
// purpose :
// =======================================================================
void D3DHost_Workspace::Redraw (const Graphic3d_CView& theCView,
const Aspect_CLayer2d& theCUnderLayer,
const Aspect_CLayer2d& theCOverLayer)
void D3DHost_Workspace::Redraw (const Graphic3d_CView& theCView)
{
if (!Activate()
|| myD3dDevice == NULL)
@ -274,7 +272,7 @@ void D3DHost_Workspace::Redraw (const Graphic3d_CView& theCView,
myToFlipOutput = Standard_True;
myD3dWglFbo->LockSurface (myGlContext);
OpenGl_Workspace::Redraw (theCView, theCUnderLayer, theCOverLayer);
OpenGl_Workspace::Redraw (theCView);
myD3dWglFbo->UnlockSurface (myGlContext);
myToFlipOutput = Standard_False;
if (myGlContext->caps->buffersNoSwap)
@ -298,15 +296,13 @@ void D3DHost_Workspace::Redraw (const Graphic3d_CView& theCView,
// function : RedrawImmediate
// purpose :
// =======================================================================
void D3DHost_Workspace::RedrawImmediate (const Graphic3d_CView& theCView,
const Aspect_CLayer2d& theCUnderLayer,
const Aspect_CLayer2d& theCOverLayer)
void D3DHost_Workspace::RedrawImmediate (const Graphic3d_CView& theCView)
{
if (!myTransientDrawToFront
|| !myBackBufferRestored
|| (myGlContext->caps->buffersNoSwap && !myMainSceneFbos[0]->IsValid()))
{
Redraw (theCView, theCUnderLayer, theCOverLayer);
Redraw (theCView);
return;
}
else if (!Activate()
@ -317,7 +313,7 @@ void D3DHost_Workspace::RedrawImmediate (const Graphic3d_CView& theCView,
myToFlipOutput = Standard_True;
myD3dWglFbo->LockSurface (myGlContext);
OpenGl_Workspace::RedrawImmediate (theCView, theCUnderLayer, theCOverLayer);
OpenGl_Workspace::RedrawImmediate (theCView);
myD3dWglFbo->UnlockSurface (myGlContext);
myToFlipOutput = Standard_False;
if (myGlContext->caps->buffersNoSwap)

8
src/D3DHost/D3DHost_Workspace.hxx
View File

@ -41,14 +41,10 @@ public:
Standard_EXPORT virtual void Resize (const CALL_DEF_WINDOW& theCWindow) Standard_OVERRIDE;
//! Redraw the all content.
Standard_EXPORT virtual void Redraw (const Graphic3d_CView& theCView,
const Aspect_CLayer2d& theCUnderLayer,
const Aspect_CLayer2d& theCOverLayer) Standard_OVERRIDE;
Standard_EXPORT virtual void Redraw (const Graphic3d_CView& theCView) Standard_OVERRIDE;
//! Redraw only immediate layer.
Standard_EXPORT virtual void RedrawImmediate (const Graphic3d_CView& theCView,
const Aspect_CLayer2d& theCUnderLayer,
const Aspect_CLayer2d& theCOverLayer) Standard_OVERRIDE;
Standard_EXPORT virtual void RedrawImmediate (const Graphic3d_CView& theCView) Standard_OVERRIDE;
public:

71
src/Graphic3d/Graphic3d_GraphicDriver.hxx
View File

@ -29,7 +29,6 @@
#include <Aspect_GradientFillMethod.hxx>
#include <Standard_CString.hxx>
#include <Aspect_FillMethod.hxx>
#include <Aspect_CLayer2d.hxx>
#include <Standard_Size.hxx>
#include <Quantity_NameOfColor.hxx>
#include <Standard_Real.hxx>
@ -120,10 +119,10 @@ public:
Standard_EXPORT virtual void RatioWindow (const Graphic3d_CView& ACView) = 0;
//! Redraw content of the view
Standard_EXPORT virtual void Redraw (const Graphic3d_CView& theCView, const Aspect_CLayer2d& theCUnderLayer, const Aspect_CLayer2d& theCOverLayer, const Standard_Integer theX = 0, const Standard_Integer theY = 0, const Standard_Integer theWidth = 0, const Standard_Integer theHeight = 0) = 0;
Standard_EXPORT virtual void Redraw (const Graphic3d_CView& theCView, const Standard_Integer theX = 0, const Standard_Integer theY = 0, const Standard_Integer theWidth = 0, const Standard_Integer theHeight = 0) = 0;
//! Redraw layer of immediate presentations
Standard_EXPORT virtual void RedrawImmediate (const Graphic3d_CView& theCView, const Aspect_CLayer2d& theCUnderLayer, const Aspect_CLayer2d& theCOverLayer) = 0;
Standard_EXPORT virtual void RedrawImmediate (const Graphic3d_CView& theCView) = 0;
//! Invalidates content of the view but does not redraw it
Standard_EXPORT virtual void Invalidate (const Graphic3d_CView& theCView) = 0;
@ -195,68 +194,6 @@ public:
//! @return previous mode.
Standard_EXPORT virtual Standard_Boolean SetImmediateModeDrawToFront (const Graphic3d_CView& theCView, const Standard_Boolean theDrawToFrontBuffer) = 0;
//! call_togl_layer2d
Standard_EXPORT virtual void Layer (Aspect_CLayer2d& ACLayer) = 0;
//! call_togl_removelayer2d
Standard_EXPORT virtual void RemoveLayer (const Aspect_CLayer2d& ACLayer) = 0;
//! call_togl_begin_layer2d
Standard_EXPORT virtual void BeginLayer (const Aspect_CLayer2d& ACLayer) = 0;
//! call_togl_begin_polygon2d
Standard_EXPORT virtual void BeginPolygon2d() = 0;
//! call_togl_begin_polyline2d
Standard_EXPORT virtual void BeginPolyline2d() = 0;
//! call_togl_clear_layer2d
Standard_EXPORT virtual void ClearLayer (const Aspect_CLayer2d& ACLayer) = 0;
//! call_togl_draw2d
Standard_EXPORT virtual void Draw (const Standard_ShortReal X, const Standard_ShortReal Y) = 0;
//! call_togl_edge2d
Standard_EXPORT virtual void Edge (const Standard_ShortReal X, const Standard_ShortReal Y) = 0;
//! call_togl_end_layer2d
Standard_EXPORT virtual void EndLayer() = 0;
//! call_togl_end_polygon2d
Standard_EXPORT virtual void EndPolygon2d() = 0;
//! call_togl_end_polyline2d
Standard_EXPORT virtual void EndPolyline2d() = 0;
//! call_togl_move2d
Standard_EXPORT virtual void Move (const Standard_ShortReal X, const Standard_ShortReal Y) = 0;
//! call_togl_rectangle2d
Standard_EXPORT virtual void Rectangle (const Standard_ShortReal X, const Standard_ShortReal Y, const Standard_ShortReal Width, const Standard_ShortReal Height) = 0;
//! call_togl_set_color
Standard_EXPORT virtual void SetColor (const Standard_ShortReal R, const Standard_ShortReal G, const Standard_ShortReal B) = 0;
//! call_togl_set_transparency
Standard_EXPORT virtual void SetTransparency (const Standard_ShortReal ATransparency) = 0;
//! call_togl_unset_transparency
Standard_EXPORT virtual void UnsetTransparency() = 0;
//! call_togl_set_line_attributes
Standard_EXPORT virtual void SetLineAttributes (const Standard_Integer Type, const Standard_ShortReal Width) = 0;
//! Set text attributes for under-/overlayer.
//! <Font> argument defines the name of the font to be used,
//! <Type> argument defines the display type of the text,
//! <R> <G> <B> values define the color of decal or subtitle background.
//! To set the color of the text you can use the SetColor method.
Standard_EXPORT virtual void SetTextAttributes (const Standard_CString Font, const Standard_Integer Type, const Standard_ShortReal R, const Standard_ShortReal G, const Standard_ShortReal B) = 0;
//! call_togl_text2d
//! If AHeight < 0 default text height is used by driver (DefaultTextHeight method)
Standard_EXPORT virtual void Text (const Standard_CString AText, const Standard_ShortReal X, const Standard_ShortReal Y, const Standard_ShortReal AHeight) = 0;
Standard_EXPORT virtual Standard_ShortReal DefaultTextHeight() const = 0;
//! call_togl_textsize2d
@ -304,13 +241,13 @@ public:
//! Returns Standard_True if the data is passed to the printer, otherwise
//! Standard_False if the print operation failed due to the printer errors,
//! or insufficient system memory available.
Standard_EXPORT virtual Standard_Boolean Print (const Graphic3d_CView& ACView, const Aspect_CLayer2d& ACUnderLayer, const Aspect_CLayer2d& ACOverLayer, const Aspect_Handle hPrnDC, const Standard_Boolean showBackground, const Standard_CString filename, const Aspect_PrintAlgo printAlgorithm = Aspect_PA_STRETCH, const Standard_Real theScaleFactor = 1.0) const = 0;
Standard_EXPORT virtual Standard_Boolean Print (const Graphic3d_CView& ACView, const Aspect_Handle hPrnDC, const Standard_Boolean showBackground, const Standard_CString filename, const Aspect_PrintAlgo printAlgorithm = Aspect_PA_STRETCH, const Standard_Real theScaleFactor = 1.0) const = 0;
//! Export scene into the one of the Vector graphics formats (SVG, PS, PDF...).
//! In contrast to Bitmaps, Vector graphics is scalable (so you may got quality benefits on printing to laser printer).
//! Notice however that results may differ a lot and do not contain some elements.
Standard_EXPORT virtual Standard_Boolean Export (const Standard_CString theFileName, const Graphic3d_ExportFormat theFormat, const Graphic3d_SortType theSortType, const Standard_Integer theWidth, const Standard_Integer theHeight, const Graphic3d_CView& theView, const Aspect_CLayer2d& theLayerUnder, const Aspect_CLayer2d& theLayerOver, const Standard_Real thePrecision = 0.005, const Standard_Address theProgressBarFunc = NULL, const Standard_Address theProgressObject = NULL) = 0;
Standard_EXPORT virtual Standard_Boolean Export (const Standard_CString theFileName, const Graphic3d_ExportFormat theFormat, const Graphic3d_SortType theSortType, const Standard_Integer theWidth, const Standard_Integer theHeight, const Graphic3d_CView& theView, const Standard_Real thePrecision = 0.005, const Standard_Address theProgressBarFunc = NULL, const Standard_Address theProgressObject = NULL) = 0;
//! Marks BVH tree and the set of BVH primitives of correspondent priority list with id theLayerId as outdated.

1
src/OpenGl/FILES
View File

@ -117,7 +117,6 @@ OpenGl_GraphicDriver_4.cxx
OpenGl_GraphicDriver_7.cxx
OpenGl_GraphicDriver_713.cxx
OpenGl_GraphicDriver_Export.cxx
OpenGl_GraphicDriver_Layer.cxx
OpenGl_IndexBuffer.cxx
OpenGl_IndexBuffer.hxx
OpenGl_Layer.cxx

49
src/OpenGl/OpenGl_GraphicDriver.cxx
View File

@ -61,8 +61,7 @@ OpenGl_GraphicDriver::OpenGl_GraphicDriver (const Handle(Aspect_DisplayConnectio
myMapOfView (1, NCollection_BaseAllocator::CommonBaseAllocator()),
myMapOfWS (1, NCollection_BaseAllocator::CommonBaseAllocator()),
myMapOfStructure (1, NCollection_BaseAllocator::CommonBaseAllocator()),
myUserDrawCallback (NULL),
myTempText (new OpenGl_Text())
myUserDrawCallback (NULL)
{
#if !defined(_WIN32) && !defined(__ANDROID__) && (!defined(__APPLE__) || defined(MACOSX_USE_GLX))
if (myDisplayConnection.IsNull())
@ -137,7 +136,6 @@ void OpenGl_GraphicDriver::ReleaseContext()
OpenGl_Structure* aStruct = aStructIt.ChangeValue();
aStruct->ReleaseGlResources (aCtxShared);
}
myTempText->Release (aCtxShared.operator->());
myDeviceLostFlag = myDeviceLostFlag || !myMapOfStructure.IsEmpty();
for (NCollection_Map<Handle(OpenGl_Workspace)>::Iterator aWindowIter (myMapOfWS);
@ -418,8 +416,6 @@ Standard_Boolean OpenGl_GraphicDriver::SetImmediateModeDrawToFront (const Graphi
// purpose :
// =======================================================================
Standard_Boolean OpenGl_GraphicDriver::Print (const Graphic3d_CView& theCView,
const Aspect_CLayer2d& theCUnderLayer,
const Aspect_CLayer2d& theCOverLayer,
const Aspect_Handle thePrintDC,
const Standard_Boolean theToShowBackground,
const Standard_CString theFilename,
@ -438,8 +434,6 @@ Standard_Boolean OpenGl_GraphicDriver::Print (const Graphic3d_CView& theCView,
#ifdef _WIN32
isPrinted = aCView->WS->Print (myPrintContext,
theCView,
theCUnderLayer,
theCOverLayer,
thePrintDC,
theToShowBackground,
theFilename,
@ -626,3 +620,44 @@ void OpenGl_GraphicDriver::SetBuffersNoSwap (const Standard_Boolean theIsNoSwap)
{
myCaps->buffersNoSwap = theIsNoSwap;
}
// =======================================================================
// function : TextSize
// purpose :
// =======================================================================
void OpenGl_GraphicDriver::TextSize (const Standard_CString theText,
const Standard_ShortReal theHeight,
Standard_ShortReal& theWidth,
Standard_ShortReal& theAscent,
Standard_ShortReal& theDescent) const
{
const Handle(OpenGl_Context)& aCtx = GetSharedContext();
if (aCtx.IsNull())
{
return;
}
const Standard_ShortReal aHeight = (theHeight < 2.0f) ? DefaultTextHeight() : theHeight;
OpenGl_TextParam aTextParam;
aTextParam.Height = (int )aHeight;
OpenGl_AspectText aTextAspect;
CALL_DEF_CONTEXTTEXT aDefaultContextText =
{
1, //IsDef
1, //IsSet
"Courier", //Font
0.3F, //Space
1.F, //Expan
{ 1.F, 1.F, 1.F }, //Color
(int)Aspect_TOST_NORMAL, //Style
(int)Aspect_TODT_NORMAL, //DisplayType
{ 1.F, 1.F, 1.F }, //ColorSubTitle
0, //TextZoomable
0.F, //TextAngle
(int)Font_FA_Regular //TextFontAspect
};
aTextAspect.SetAspect(aDefaultContextText);
TCollection_ExtendedString anExtText = theText;
NCollection_String aText = (Standard_Utf16Char* )anExtText.ToExtString();
OpenGl_Text::StringSize (aCtx, aText, aTextAspect, aTextParam, theWidth, theAscent, theDescent);
}

41
src/OpenGl/OpenGl_GraphicDriver.hxx
View File

@ -31,7 +31,6 @@
#include <Aspect_DisplayConnection.hxx>
#include <Aspect_GradientFillMethod.hxx>
#include <Aspect_FillMethod.hxx>
#include <Aspect_CLayer2d.hxx>
#include <Aspect_TypeOfTriedronPosition.hxx>
#include <Aspect_TypeOfTriedronEcho.hxx>
#include <Aspect_Handle.hxx>
@ -146,15 +145,11 @@ public:
Standard_EXPORT void DepthCueing (const Graphic3d_CView& ACView, const Standard_Boolean AFlag);
Standard_EXPORT void RatioWindow (const Graphic3d_CView& ACView);
Standard_EXPORT void Redraw (const Graphic3d_CView& theCView,
const Aspect_CLayer2d& theCUnderLayer,
const Aspect_CLayer2d& theCOverLayer,
const Standard_Integer theX = 0,
const Standard_Integer theY = 0,
const Standard_Integer theWidth = 0,
const Standard_Integer theHeight = 0);
Standard_EXPORT void RedrawImmediate (const Graphic3d_CView& theCView,
const Aspect_CLayer2d& theCUnderLayer,
const Aspect_CLayer2d& theCOverLayer);
Standard_EXPORT void RedrawImmediate (const Graphic3d_CView& theCView);
Standard_EXPORT void Invalidate (const Graphic3d_CView& theCView);
Standard_EXPORT Standard_Boolean IsInvalidated (const Graphic3d_CView& theCView) const;
Standard_EXPORT void RemoveView (const Graphic3d_CView& ACView);
@ -196,35 +191,6 @@ public:
Standard_EXPORT void GraduatedTrihedronMinMaxValues (const Graphic3d_CView& theView,
const Graphic3d_Vec3 theMin, const Graphic3d_Vec3 theMax);
Standard_EXPORT void Layer (Aspect_CLayer2d& ACLayer);
Standard_EXPORT void RemoveLayer (const Aspect_CLayer2d& ACLayer);
Standard_EXPORT void BeginLayer (const Aspect_CLayer2d& ACLayer);
Standard_EXPORT void BeginPolygon2d ();
Standard_EXPORT void BeginPolyline2d ();
Standard_EXPORT void ClearLayer (const Aspect_CLayer2d& ACLayer);
Standard_EXPORT void Draw (const Standard_ShortReal X,const Standard_ShortReal Y);
Standard_EXPORT void Edge (const Standard_ShortReal X,const Standard_ShortReal Y);
Standard_EXPORT void EndLayer ();
Standard_EXPORT void EndPolygon2d ();
Standard_EXPORT void EndPolyline2d ();
Standard_EXPORT void Move (const Standard_ShortReal X,const Standard_ShortReal Y);
Standard_EXPORT void Rectangle (const Standard_ShortReal X,const Standard_ShortReal Y,const Standard_ShortReal Width,const Standard_ShortReal Height);
Standard_EXPORT void SetColor (const Standard_ShortReal R,const Standard_ShortReal G,const Standard_ShortReal B);
Standard_EXPORT void SetTransparency (const Standard_ShortReal ATransparency);
Standard_EXPORT void UnsetTransparency ();
Standard_EXPORT void SetLineAttributes (const Standard_Integer Type,const Standard_ShortReal Width);
//! Set text attributes for under-/overlayer.
//! @param theFontName the name of the font to be used
//! @param theType the display type of the text
//! theR theG theB values define the color of decal or subtitle background
//! To set the color of the text you can use the SetColor method.
Standard_EXPORT void SetTextAttributes (const Standard_CString theFontName,
const Standard_Integer theType,
const Standard_ShortReal theR,
const Standard_ShortReal theG,
const Standard_ShortReal theB);
Standard_EXPORT void Text (const Standard_CString AText,const Standard_ShortReal X,const Standard_ShortReal Y,const Standard_ShortReal AHeight);
Standard_EXPORT void TextSize (const Standard_CString AText,const Standard_ShortReal AHeight,Standard_ShortReal& AWidth,Standard_ShortReal& AnAscent,Standard_ShortReal& ADescent) const;
Standard_EXPORT void SetBackFacingModel (const Graphic3d_CView& aView);
@ -239,8 +205,6 @@ public:
//! All this errors are indicated by the message boxes (on level of OpenGl_GraphicDriver).
//! Warning: This function can reuse FBO assigned to the view, please take it into account if you use it for your purposes.
Standard_EXPORT Standard_Boolean Print (const Graphic3d_CView& theCView,
const Aspect_CLayer2d& theCUnderLayer,
const Aspect_CLayer2d& theCOverLayer,
const Aspect_Handle thePrinterDC,
const Standard_Boolean theToShowBackground,
const Standard_CString theFileName,
@ -274,7 +238,7 @@ public:
Standard_EXPORT void FBOChangeViewport(const Graphic3d_CView& view,Graphic3d_PtrFrameBuffer& fboPtr,const Standard_Integer width,const Standard_Integer height);
Standard_EXPORT Standard_Boolean Export(const Standard_CString theFileName,const Graphic3d_ExportFormat theFormat,const Graphic3d_SortType theSortType,const Standard_Integer theWidth,const Standard_Integer theHeight,const Graphic3d_CView& theView,const Aspect_CLayer2d& theLayerUnder,const Aspect_CLayer2d& theLayerOver,const Standard_Real thePrecision = 0.005,const Standard_Address theProgressBarFunc = NULL,const Standard_Address theProgressObject = NULL);
Standard_EXPORT Standard_Boolean Export(const Standard_CString theFileName,const Graphic3d_ExportFormat theFormat,const Graphic3d_SortType theSortType,const Standard_Integer theWidth,const Standard_Integer theHeight,const Graphic3d_CView& theView,const Standard_Real thePrecision = 0.005,const Standard_Address theProgressBarFunc = NULL,const Standard_Address theProgressObject = NULL);
//! Add a new top-level z layer with ID theLayerId for the view. Z layers allow drawing structures in higher layers in foreground of structures in lower layers.
//! To add a structure to desired layer on display it is necessary to set the layer index for the structure.
@ -376,7 +340,6 @@ protected:
NCollection_DataMap<Standard_Integer, OpenGl_Structure*> myMapOfStructure;
mutable Handle(OpenGl_PrinterContext) myPrintContext;
OpenGl_UserDrawCallback_t myUserDrawCallback;
OpenGl_Text* myTempText; //!< variable for compatibility (drawing text in layers)
public:

11
src/OpenGl/OpenGl_GraphicDriver_7.cxx
View File

@ -96,8 +96,6 @@ void OpenGl_GraphicDriver::RatioWindow (const Graphic3d_CView& theCView)
}
void OpenGl_GraphicDriver::Redraw (const Graphic3d_CView& ACView,
const Aspect_CLayer2d& ACUnderLayer,
const Aspect_CLayer2d& ACOverLayer,
const Standard_Integer /*x*/,
const Standard_Integer /*y*/,
const Standard_Integer /*width*/,
@ -123,18 +121,16 @@ void OpenGl_GraphicDriver::Redraw (const Graphic3d_CView& ACView,
else
aCView->WS->RedrawArea(ACView, ACUnderLayer, ACOverLayer, x, y, width, height);*/
// Always do full redraw
aCView->WS->Redraw(ACView, ACUnderLayer, ACOverLayer);
aCView->WS->Redraw(ACView);
}
}
void OpenGl_GraphicDriver::RedrawImmediate (const Graphic3d_CView& theCView,
const Aspect_CLayer2d& theCUnderLayer,
const Aspect_CLayer2d& theCOverLayer)
void OpenGl_GraphicDriver::RedrawImmediate (const Graphic3d_CView& theCView)
{
const OpenGl_CView* aCView = (const OpenGl_CView* )theCView.ptrView;
if (aCView != NULL)
{
aCView->WS->RedrawImmediate (theCView, theCUnderLayer, theCOverLayer);
aCView->WS->RedrawImmediate (theCView);
}
}
@ -464,7 +460,6 @@ void OpenGl_GraphicDriver::RemoveView (const Graphic3d_CView& theCView)
OpenGl_Structure* aStruct = aStructIt.ChangeValue();
aStruct->ReleaseGlResources (aCtx);
}
myTempText->Release (aCtx.operator->());
myDeviceLostFlag = !myMapOfStructure.IsEmpty();
}

6
src/OpenGl/OpenGl_GraphicDriver_Export.cxx
View File

@ -32,8 +32,6 @@ Standard_Boolean OpenGl_GraphicDriver::Export (const Standard_CString theFileNam
const Standard_Integer theWidth,
const Standard_Integer theHeight,
const Graphic3d_CView& theView,
const Aspect_CLayer2d& theLayerUnder,
const Aspect_CLayer2d& theLayerOver,
const Standard_Real /*thePrecision*/,
const Standard_Address /*theProgressBarFunc*/,
const Standard_Address /*theProgressObject*/)
@ -114,7 +112,7 @@ Standard_Boolean OpenGl_GraphicDriver::Export (const Standard_CString theFileNam
fclose (aFileH);
break;
}
Redraw (theView, theLayerUnder, theLayerOver);
Redraw (theView);
anErrCode = gl2psEndPage();
if (aFileH != NULL)
@ -134,8 +132,6 @@ Standard_Boolean OpenGl_GraphicDriver::Export (const Standard_CString /*theFileN
const Standard_Integer /*theWidth*/,
const Standard_Integer /*theHeight*/,
const Graphic3d_CView& /*theView*/,
const Aspect_CLayer2d& /*theLayerUnder*/,
const Aspect_CLayer2d& /*theLayerOver*/,
const Standard_Real /*thePrecision*/,
const Standard_Address /*theProgressBarFunc*/,
const Standard_Address /*theProgressObject*/)

343
src/OpenGl/OpenGl_GraphicDriver_Layer.cxx
View File

@ -1,343 +0,0 @@
// Created on: 2011-10-20
// Created by: Sergey ZERCHANINOV
// Copyright (c) 2011-2014 OPEN CASCADE SAS
//
// This file is part of Open CASCADE Technology software library.
//
// This library is free software; you can redistribute it and/or modify it under
// the terms of the GNU Lesser General Public License version 2.1 as published
// by the Free Software Foundation, with special exception defined in the file
// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
// distribution for complete text of the license and disclaimer of any warranty.
//
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#include <OpenGl_GlCore11.hxx>
#include <OpenGl_GraphicDriver.hxx>
#include <Font_FontAspect.hxx>
#include <OpenGl_AspectText.hxx>
#include <OpenGl_Text.hxx>
#include <OpenGl_TextParam.hxx>
#include <OpenGl_LineAttributes.hxx>
/*----------------------------------------------------------------------*/
struct OpenGl_LAYER_PROP
{
int ListId;
TEL_COLOUR Color;
int NbPoints;
int LineType;
float LineWidth;
OpenGl_AspectText AspectText;
OpenGl_TextParam TextParam;
};
/*----------------------------------------------------------------------*/
namespace
{
static const TEL_COLOUR myDefaultColor = {{ 1.F, 1.F, 1.F, 1.F }};
static const CALL_DEF_CONTEXTTEXT myDefaultContextText =
{
1, //IsDef
1, //IsSet
"Courier", //Font
0.3F, //Space
1.F, //Expan
{ 1.F, 1.F, 1.F }, //Color
(int)Aspect_TOST_NORMAL, //Style
(int)Aspect_TODT_NORMAL, //DisplayType
{ 1.F, 1.F, 1.F }, //ColorSubTitle
0, //TextZoomable
0.F, //TextAngle
(int)Font_FA_Regular //TextFontAspect
};
static Standard_Boolean TheLayerIsOpen = Standard_False;
static OpenGl_LAYER_PROP TheLayerProp;
}
/*----------------------------------------------------------------------*/
void InitLayerProp (const int theListId)
{
TheLayerProp.ListId = theListId;
if (theListId)
{
TheLayerProp.Color = myDefaultColor;
TheLayerProp.NbPoints = 0;
TheLayerProp.LineType = -1;
TheLayerProp.LineWidth = -1.F;
TheLayerProp.AspectText.SetAspect (myDefaultContextText);
TheLayerProp.TextParam.HAlign = Graphic3d_HTA_LEFT;
TheLayerProp.TextParam.VAlign = Graphic3d_VTA_BOTTOM;
}
}
/*----------------------------------------------------------------------*/
void OpenGl_GraphicDriver::Layer (Aspect_CLayer2d& ACLayer)
{
ACLayer.ptrLayer = new CALL_DEF_PTRLAYER();
#if !defined(GL_ES_VERSION_2_0)
ACLayer.ptrLayer->listIndex = glGenLists(1);
#endif
}
/*----------------------------------------------------------------------*/
void OpenGl_GraphicDriver::RemoveLayer (const Aspect_CLayer2d& ACLayer)
{
if (!ACLayer.ptrLayer) return;
if (!ACLayer.ptrLayer->listIndex) return;
if (TheLayerProp.ListId == ACLayer.ptrLayer->listIndex)
EndLayer();
#if !defined(GL_ES_VERSION_2_0)
glDeleteLists (ACLayer.ptrLayer->listIndex, 1);
#endif
ACLayer.ptrLayer->listIndex = 0;
//szvgl: memory leak here?
//free ( ACLayer.ptrLayer );
//ACLayer.ptrLayer = NULL;
}
/*----------------------------------------------------------------------*/
void OpenGl_GraphicDriver::BeginLayer (const Aspect_CLayer2d& ACLayer)
{
call_def_ptrLayer ptrLayer = (call_def_ptrLayer) ACLayer.ptrLayer;
if (!ptrLayer) return;
InitLayerProp (ptrLayer->listIndex);
if (!TheLayerProp.ListId) return;
#if !defined(GL_ES_VERSION_2_0)
glNewList (TheLayerProp.ListId, GL_COMPILE);
#endif
TheLayerIsOpen = Standard_True;
}
void OpenGl_GraphicDriver::BeginPolygon2d ()
{
if (!TheLayerProp.ListId) return;
TheLayerProp.NbPoints = 0;
#if !defined(GL_ES_VERSION_2_0)
glBegin (GL_POLYGON);
#endif
}
void OpenGl_GraphicDriver::BeginPolyline2d ()
{
if (!TheLayerProp.ListId) return;
TheLayerProp.NbPoints = 0;
#if !defined(GL_ES_VERSION_2_0)
glBegin (GL_LINE_STRIP);
#endif
}
void OpenGl_GraphicDriver::ClearLayer (const Aspect_CLayer2d& ACLayer)
{
if (!ACLayer.ptrLayer) return;
InitLayerProp (ACLayer.ptrLayer->listIndex);
if (!TheLayerProp.ListId) return;
#if !defined(GL_ES_VERSION_2_0)
glNewList (TheLayerProp.ListId, GL_COMPILE);
glEndList ();
#endif
}
void OpenGl_GraphicDriver::Draw (const Standard_ShortReal X, const Standard_ShortReal Y)
{
if (!TheLayerProp.ListId) return;
TheLayerProp.NbPoints++;
#if !defined(GL_ES_VERSION_2_0)
glVertex3f (X, Y, 0.F);
#endif
}
void OpenGl_GraphicDriver::Edge (const Standard_ShortReal X, const Standard_ShortReal Y)
{
if (!TheLayerProp.ListId) return;
TheLayerProp.NbPoints++;
#if !defined(GL_ES_VERSION_2_0)
glVertex3f (X, Y, 0.F);
#endif
}
void OpenGl_GraphicDriver::EndLayer ()
{
if (!TheLayerProp.ListId) return;
if (TheLayerIsOpen)
{
#if !defined(GL_ES_VERSION_2_0)
glEndList();
#endif
TheLayerIsOpen = Standard_False;
}
TheLayerProp.ListId = 0;
}
void OpenGl_GraphicDriver::EndPolygon2d ()
{
if (!TheLayerProp.ListId) return;
#if !defined(GL_ES_VERSION_2_0)
glEnd ();
#endif
}
void OpenGl_GraphicDriver::EndPolyline2d ()
{
if (!TheLayerProp.ListId) return;
#if !defined(GL_ES_VERSION_2_0)
glEnd ();
#endif
}
void OpenGl_GraphicDriver::Move (const Standard_ShortReal X, const Standard_ShortReal Y)
{
if (!TheLayerProp.ListId) return;
if (TheLayerProp.NbPoints)
{
#if !defined(GL_ES_VERSION_2_0)
glEnd ();
glBegin (GL_LINE_STRIP);
#endif
TheLayerProp.NbPoints = 0;
}
TheLayerProp.NbPoints++;
#if !defined(GL_ES_VERSION_2_0)
glVertex3f (X, Y, 0.F);
#endif
}
void OpenGl_GraphicDriver::Rectangle (const Standard_ShortReal X, const Standard_ShortReal Y, const Standard_ShortReal Width, const Standard_ShortReal Height)
{
if (!TheLayerProp.ListId) return;
#if !defined(GL_ES_VERSION_2_0)
glRectf (X, Y, X + Width, Y + Height);
#endif
}
void OpenGl_GraphicDriver::SetColor (const Standard_ShortReal R, const Standard_ShortReal G, const Standard_ShortReal B)
{
if (!TheLayerProp.ListId) return;
TheLayerProp.Color.rgb[0] = R;
TheLayerProp.Color.rgb[1] = G;
TheLayerProp.Color.rgb[2] = B;
#if !defined(GL_ES_VERSION_2_0)
glColor3fv (TheLayerProp.Color.rgb);
#endif
}
void OpenGl_GraphicDriver::SetTransparency (const Standard_ShortReal ATransparency)
{
if (!TheLayerProp.ListId) return;
TheLayerProp.Color.rgb[3] = ATransparency;
#if !defined(GL_ES_VERSION_2_0)
glEnable (GL_BLEND);
glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glColor4fv (TheLayerProp.Color.rgb);
#endif
}
void OpenGl_GraphicDriver::UnsetTransparency ()
{
if (!TheLayerProp.ListId) return;
TheLayerProp.Color.rgb[3] = 1.F;
#if !defined(GL_ES_VERSION_2_0)
glDisable (GL_BLEND);
#endif
}
void OpenGl_GraphicDriver::SetLineAttributes (const Standard_Integer theType,
const Standard_ShortReal theWidth)
{
const Handle(OpenGl_Context)& aCtx = GetSharedContext();
if (!TheLayerProp.ListId
|| aCtx.IsNull())
{
return;
}
if (TheLayerProp.LineType != theType)
{
TheLayerProp.LineType = theType;
aCtx->SetTypeOfLine ((Aspect_TypeOfLine) theType);
}
if (TheLayerProp.LineWidth != theWidth)
{
TheLayerProp.LineWidth = theWidth;
aCtx->SetLineWidth (theWidth);
}
}
void OpenGl_GraphicDriver::SetTextAttributes (const Standard_CString theFont,
const Standard_Integer theType,
const Standard_ShortReal theR,
const Standard_ShortReal theG,
const Standard_ShortReal theB)
{
if (!TheLayerProp.ListId)
{
return;
}
TheLayerProp.AspectText.ChangeFontName() = theFont;
TheLayerProp.AspectText.SetDisplayType ((Aspect_TypeOfDisplayText )theType);
TEL_COLOUR& aSubColor = TheLayerProp.AspectText.ChangeSubtitleColor();
aSubColor.rgb[0] = (float )theR;
aSubColor.rgb[1] = (float )theG;
aSubColor.rgb[2] = (float )theB;
}
void OpenGl_GraphicDriver::Text (const Standard_CString theText,
const Standard_ShortReal theX,
const Standard_ShortReal theY,
const Standard_ShortReal theHeight)
{
const Handle(OpenGl_Context)& aCtx = GetSharedContext();
if (!TheLayerProp.ListId || aCtx.IsNull())
{
return;
}
const Standard_ShortReal aHeight = (theHeight < 2.0f) ? DefaultTextHeight() : theHeight;
TheLayerProp.TextParam.Height = (int )aHeight;
TheLayerProp.AspectText.ChangeColor() = TheLayerProp.Color;
myTempText->Init (aCtx, TCollection_ExtendedString (theText), OpenGl_Vec2 (theX, theY), TheLayerProp.TextParam);
myTempText->Render (myPrintContext, aCtx, TheLayerProp.AspectText);
//myTempText->Release (aCtx);
}
void OpenGl_GraphicDriver::TextSize (const Standard_CString theText,
const Standard_ShortReal theHeight,
Standard_ShortReal& theWidth,
Standard_ShortReal& theAscent,
Standard_ShortReal& theDescent) const
{
const Handle(OpenGl_Context)& aCtx = GetSharedContext();
if (!TheLayerProp.ListId || aCtx.IsNull())
{
return;
}
const Standard_ShortReal aHeight = (theHeight < 2.0f) ? DefaultTextHeight() : theHeight;
TheLayerProp.TextParam.Height = (int )aHeight;
TCollection_ExtendedString anExtText = theText;
NCollection_String aText = (Standard_Utf16Char* )anExtText.ToExtString();
OpenGl_Text::StringSize (aCtx, aText, TheLayerProp.AspectText, TheLayerProp.TextParam, theWidth, theAscent, theDescent);
}

8
src/OpenGl/OpenGl_View.hxx
View File

@ -27,7 +27,6 @@
#include <Aspect_FillMethod.hxx>
#include <Aspect_GradientFillMethod.hxx>
#include <Aspect_TypeOfTriedronPosition.hxx>
#include <Aspect_CLayer2d.hxx>
#include <InterfaceGraphic_Graphic3d.hxx>
#include <InterfaceGraphic_Visual3d.hxx>
@ -160,8 +159,6 @@ class OpenGl_View : public MMgt_TShared
OpenGl_FrameBuffer* theReadDrawFbo,
Graphic3d_Camera::Projection theProjection,
const Graphic3d_CView& theCView,
const Aspect_CLayer2d& theCUnderLayer,
const Aspect_CLayer2d& theCOverLayer,
const Standard_Boolean theToDrawImmediate);
void DrawBackground (const Handle(OpenGl_Workspace)& theWorkspace);
@ -199,11 +196,6 @@ protected:
const Graphic3d_CView& theCView,
const Standard_Boolean theToDrawImmediate);
void RedrawLayer2d (const Handle(OpenGl_PrinterContext)& thePrintContext,
const Handle(OpenGl_Workspace)& theWorkspace,
const Graphic3d_CView& theCView,
const Aspect_CLayer2d& theCLayer);
void RedrawTrihedron (const Handle(OpenGl_Workspace) &theWorkspace);
//! Redraw contents of model scene: clipping planes,

174
src/OpenGl/OpenGl_View_2.cxx
View File

@ -23,7 +23,6 @@
#include <Graphic3d_Texture2Dmanual.hxx>
#include <Graphic3d_GraphicDriver.hxx>
#include <Image_AlienPixMap.hxx>
#include <Visual3d_Layer.hxx>
#include <NCollection_Mat4.hxx>
@ -257,8 +256,6 @@ void OpenGl_View::Render (const Handle(OpenGl_PrinterContext)& thePrintContext,
OpenGl_FrameBuffer* theOutputFBO,
Graphic3d_Camera::Projection theProjection,
const Graphic3d_CView& theCView,
const Aspect_CLayer2d& theCUnderLayer,
const Aspect_CLayer2d& theCOverLayer,
const Standard_Boolean theToDrawImmediate)
{
// ==================================
@ -325,15 +322,7 @@ void OpenGl_View::Render (const Handle(OpenGl_PrinterContext)& thePrintContext,
#endif
// =================================
// Step 3: Draw underlayer
// =================================
if (!theToDrawImmediate)
{
RedrawLayer2d (thePrintContext, theWorkspace, theCView, theCUnderLayer);
}
// =================================
// Step 4: Redraw main plane
// Step 3: Redraw main plane
// =================================
// Setup face culling
@ -435,7 +424,7 @@ void OpenGl_View::Render (const Handle(OpenGl_PrinterContext)& thePrintContext,
RedrawScene (thePrintContext, theWorkspace, theOutputFBO, theCView, theToDrawImmediate);
// ===============================
// Step 5: Trihedron
// Step 4: Trihedron
// ===============================
// Resetting GL parameters according to the default aspects
@ -475,21 +464,8 @@ void OpenGl_View::Render (const Handle(OpenGl_PrinterContext)& thePrintContext,
}
}
// ===============================
// Step 6: Redraw overlay
// ===============================
if (!theToDrawImmediate)
{
const int aMode = 0;
theWorkspace->DisplayCallback (theCView, (aMode | OCC_PRE_OVERLAY));
RedrawLayer2d (thePrintContext, theWorkspace, theCView, theCOverLayer);
theWorkspace->DisplayCallback (theCView, aMode);
}
// ==============================================================
// Step 7: Keep shader manager informed about last View
// Step 5: Keep shader manager informed about last View
// ==============================================================
if (!aManager.IsNull())
@ -650,150 +626,6 @@ void OpenGl_View::RenderStructs (const Handle(OpenGl_Workspace)& theWorkspace,
/*----------------------------------------------------------------------*/
//call_togl_redraw_layer2d
void OpenGl_View::RedrawLayer2d (const Handle(OpenGl_PrinterContext)& thePrintContext,
const Handle(OpenGl_Workspace)& theWorkspace,
const Graphic3d_CView& /*ACView*/,
const Aspect_CLayer2d& ACLayer)
{
#if !defined(GL_ES_VERSION_2_0)
if (&ACLayer == NULL
|| ACLayer.ptrLayer == NULL
|| ACLayer.ptrLayer->listIndex == 0) return;
const Handle(OpenGl_Context)& aContext = theWorkspace->GetGlContext();
if (aContext->core11 == NULL)
{
return;
}
GLsizei dispWidth = (GLsizei )ACLayer.viewport[0];
GLsizei dispHeight = (GLsizei )ACLayer.viewport[1];
aContext->WorldViewState.Push();
aContext->ProjectionState.Push();
aContext->WorldViewState.SetIdentity();
aContext->ProjectionState.SetIdentity();
aContext->ApplyWorldViewMatrix();
aContext->ApplyProjectionMatrix();
if (!ACLayer.sizeDependent)
aContext->core11fwd->glViewport (0, 0, dispWidth, dispHeight);
float left = ACLayer.ortho[0];
float right = ACLayer.ortho[1];
float bottom = ACLayer.ortho[2];
float top = ACLayer.ortho[3];
int attach = ACLayer.attach;
const float ratio = !ACLayer.sizeDependent
? float(dispWidth) / float(dispHeight)
: float(theWorkspace->Width()) / float(theWorkspace->Height());
float delta;
if (ratio >= 1.0) {
delta = (float )((top - bottom)/2.0);
switch (attach) {
case 0: /* Aspect_TOC_BOTTOM_LEFT */
top = bottom + 2*delta/ratio;
break;
case 1: /* Aspect_TOC_BOTTOM_RIGHT */
top = bottom + 2*delta/ratio;
break;
case 2: /* Aspect_TOC_TOP_LEFT */
bottom = top - 2*delta/ratio;
break;
case 3: /* Aspect_TOC_TOP_RIGHT */
bottom = top - 2*delta/ratio;
break;
}
}
else {
delta = (float )((right - left)/2.0);
switch (attach) {
case 0: /* Aspect_TOC_BOTTOM_LEFT */
right = left + 2*delta*ratio;
break;
case 1: /* Aspect_TOC_BOTTOM_RIGHT */
left = right - 2*delta*ratio;
break;
case 2: /* Aspect_TOC_TOP_LEFT */
right = left + 2*delta*ratio;
break;
case 3: /* Aspect_TOC_TOP_RIGHT */
left = right - 2*delta*ratio;
break;
}
}
#ifdef _WIN32
// Check printer context that exists only for print operation
if (!thePrintContext.IsNull())
{
// additional transformation matrix could be applied to
// render only those parts of viewport that will be
// passed to a printer as a current "frame" to provide
// tiling; scaling of graphics by matrix helps render a
// part of a view (frame) in same viewport, but with higher
// resolution
// set printing scale/tiling transformation
aContext->ProjectionState.SetCurrent (thePrintContext->ProjTransformation());
aContext->ApplyProjectionMatrix();
// printing operation also assumes other viewport dimension
// to comply with transformation matrix or graphics scaling
// factors for tiling for layer redraw
GLsizei anViewportX = 0;
GLsizei anViewportY = 0;
thePrintContext->GetLayerViewport (anViewportX, anViewportY);
if (anViewportX != 0 && anViewportY != 0)
aContext->core11fwd->glViewport (0, 0, anViewportX, anViewportY);
}
#endif
glOrtho (left, right, bottom, top, -1.0, 1.0);
glPushAttrib (
GL_LIGHTING_BIT | GL_LINE_BIT | GL_POLYGON_BIT |
GL_DEPTH_BUFFER_BIT | GL_CURRENT_BIT | GL_TEXTURE_BIT );
glDisable (GL_DEPTH_TEST);
glDisable (GL_TEXTURE_1D);
glDisable (GL_TEXTURE_2D);
glDisable (GL_LIGHTING);
// TODO: Obsolete code, the display list is always empty now, to be removed
glCallList (ACLayer.ptrLayer->listIndex);
//calling dynamic render of LayerItems
if ( ACLayer.ptrLayer->layerData )
{
InitLayerProp (ACLayer.ptrLayer->listIndex);
((Visual3d_Layer*)ACLayer.ptrLayer->layerData)->RenderLayerItems();
InitLayerProp (0);
}
glPopAttrib ();
aContext->WorldViewState.Pop();
aContext->ProjectionState.Pop();
aContext->ApplyProjectionMatrix();
aContext->ApplyWorldViewMatrix();
if (!ACLayer.sizeDependent)
aContext->core11fwd->glViewport (0, 0, theWorkspace->Width(), theWorkspace->Height());
glFlush ();
#endif
}
/*----------------------------------------------------------------------*/
void OpenGl_View::RedrawTrihedron (const Handle(OpenGl_Workspace) &theWorkspace)
{
// display global trihedron

39
src/OpenGl/OpenGl_Workspace.cxx
View File

@ -1002,9 +1002,7 @@ void OpenGl_Workspace::drawStereoPair (const Graphic3d_CView& theCView)
// function : Redraw
// purpose :
// =======================================================================
void OpenGl_Workspace::Redraw (const Graphic3d_CView& theCView,
const Aspect_CLayer2d& theCUnderLayer,
const Aspect_CLayer2d& theCOverLayer)
void OpenGl_Workspace::Redraw (const Graphic3d_CView& theCView)
{
if (!Activate())
{
@ -1128,14 +1126,13 @@ void OpenGl_Workspace::Redraw (const Graphic3d_CView& theCView,
#if !defined(GL_ES_VERSION_2_0)
myGlContext->SetReadDrawBuffer (aStereoMode == Graphic3d_StereoMode_QuadBuffer ? GL_BACK_LEFT : GL_BACK);
#endif
redraw1 (theCView, theCUnderLayer, theCOverLayer,
aMainFbos[0], Graphic3d_Camera::Projection_MonoLeftEye);
redraw1 (theCView, aMainFbos[0], Graphic3d_Camera::Projection_MonoLeftEye);
myBackBufferRestored = Standard_True;
myIsImmediateDrawn = Standard_False;
#if !defined(GL_ES_VERSION_2_0)
myGlContext->SetReadDrawBuffer (aStereoMode == Graphic3d_StereoMode_QuadBuffer ? GL_BACK_LEFT : GL_BACK);
#endif
if (!redrawImmediate (theCView, theCOverLayer, theCUnderLayer, aMainFbos[0], aProjectType, anImmFbos[0]))
if (!redrawImmediate (theCView, aMainFbos[0], aProjectType, anImmFbos[0]))
{
toSwap = false;
}
@ -1148,11 +1145,10 @@ void OpenGl_Workspace::Redraw (const Graphic3d_CView& theCView,
#if !defined(GL_ES_VERSION_2_0)
myGlContext->SetReadDrawBuffer (aStereoMode == Graphic3d_StereoMode_QuadBuffer ? GL_BACK_RIGHT : GL_BACK);
#endif
redraw1 (theCView, theCUnderLayer, theCOverLayer,
aMainFbos[1], Graphic3d_Camera::Projection_MonoRightEye);
redraw1 (theCView, aMainFbos[1], Graphic3d_Camera::Projection_MonoRightEye);
myBackBufferRestored = Standard_True;
myIsImmediateDrawn = Standard_False;
if (!redrawImmediate (theCView, theCOverLayer, theCUnderLayer, aMainFbos[1], aProjectType, anImmFbos[1]))
if (!redrawImmediate (theCView, aMainFbos[1], aProjectType, anImmFbos[1]))
{
toSwap = false;
}
@ -1179,11 +1175,10 @@ void OpenGl_Workspace::Redraw (const Graphic3d_CView& theCView,
myGlContext->SetReadDrawBuffer (GL_BACK);
}
#endif
redraw1 (theCView, theCUnderLayer, theCOverLayer,
aMainFbo != NULL ? aMainFbo : aFrameBuffer, aProjectType);
redraw1 (theCView, aMainFbo != NULL ? aMainFbo : aFrameBuffer, aProjectType);
myBackBufferRestored = Standard_True;
myIsImmediateDrawn = Standard_False;
if (!redrawImmediate (theCView, theCOverLayer, theCUnderLayer, aMainFbo, aProjectType, anImmFbo))
if (!redrawImmediate (theCView, aMainFbo, aProjectType, anImmFbo))
{
toSwap = false;
}
@ -1239,8 +1234,6 @@ void OpenGl_Workspace::Redraw (const Graphic3d_CView& theCView,
// purpose :
// =======================================================================
void OpenGl_Workspace::redraw1 (const Graphic3d_CView& theCView,
const Aspect_CLayer2d& theCUnderLayer,
const Aspect_CLayer2d& theCOverLayer,
OpenGl_FrameBuffer* theReadDrawFbo,
const Graphic3d_Camera::Projection theProjection)
{
@ -1288,7 +1281,7 @@ void OpenGl_Workspace::redraw1 (const Graphic3d_CView& theCView,
glClear (toClear);
Handle(OpenGl_Workspace) aWS (this);
myView->Render (myPrintContext, aWS, theReadDrawFbo, theProjection, theCView, theCUnderLayer, theCOverLayer, Standard_False);
myView->Render (myPrintContext, aWS, theReadDrawFbo, theProjection, theCView, Standard_False);
}
// =======================================================================
@ -1377,15 +1370,13 @@ void OpenGl_Workspace::DisplayCallback (const Graphic3d_CView& theCView,
// function : RedrawImmediate
// purpose :
// =======================================================================
void OpenGl_Workspace::RedrawImmediate (const Graphic3d_CView& theCView,
const Aspect_CLayer2d& theCUnderLayer,
const Aspect_CLayer2d& theCOverLayer)
void OpenGl_Workspace::RedrawImmediate (const Graphic3d_CView& theCView)
{
if (!myTransientDrawToFront
|| !myBackBufferRestored
|| (myGlContext->caps->buffersNoSwap && !myMainSceneFbos[0]->IsValid()))
{
Redraw (theCView, theCUnderLayer, theCOverLayer);
Redraw (theCView);
return;
}
else if (!Activate())
@ -1443,7 +1434,7 @@ void OpenGl_Workspace::RedrawImmediate (const Graphic3d_CView& theCView,
myGlContext->SetReadDrawBuffer (aStereoMode == Graphic3d_StereoMode_QuadBuffer ? GL_BACK_LEFT : GL_BACK);
}
#endif
toSwap = redrawImmediate (theCView, theCUnderLayer, theCOverLayer,
toSwap = redrawImmediate (theCView,
aMainFbos[0],
Graphic3d_Camera::Projection_MonoLeftEye,
anImmFbos[0],
@ -1465,7 +1456,7 @@ void OpenGl_Workspace::RedrawImmediate (const Graphic3d_CView& theCView,
myGlContext->SetReadDrawBuffer (aStereoMode == Graphic3d_StereoMode_QuadBuffer ? GL_BACK_RIGHT : GL_BACK);
}
#endif
toSwap = redrawImmediate (theCView, theCUnderLayer, theCOverLayer,
toSwap = redrawImmediate (theCView,
aMainFbos[1],
Graphic3d_Camera::Projection_MonoRightEye,
anImmFbos[1],
@ -1490,7 +1481,7 @@ void OpenGl_Workspace::RedrawImmediate (const Graphic3d_CView& theCView,
myGlContext->SetReadDrawBuffer (GL_BACK);
}
#endif
toSwap = redrawImmediate (theCView, theCUnderLayer, theCOverLayer,
toSwap = redrawImmediate (theCView,
aMainFbo,
aProjectType,
anImmFbo,
@ -1521,8 +1512,6 @@ void OpenGl_Workspace::RedrawImmediate (const Graphic3d_CView& theCView,
// purpose :
// =======================================================================
bool OpenGl_Workspace::redrawImmediate (const Graphic3d_CView& theCView,
const Aspect_CLayer2d& theCUnderLayer,
const Aspect_CLayer2d& theCOverLayer,
OpenGl_FrameBuffer* theReadFbo,
const Graphic3d_Camera::Projection theProjection,
OpenGl_FrameBuffer* theDrawFbo,
@ -1582,7 +1571,7 @@ bool OpenGl_Workspace::redrawImmediate (const Graphic3d_CView& theCView,
#endif
myView->Render (myPrintContext, aWS, theDrawFbo, theProjection,
theCView, theCUnderLayer, theCOverLayer, Standard_True);
theCView, Standard_True);
return !toCopyBackToFront;
}

15
src/OpenGl/OpenGl_Workspace.hxx
View File

@ -29,7 +29,6 @@
#include <Graphic3d_PtrFrameBuffer.hxx>
#include <Graphic3d_BufferType.hxx>
#include <Aspect_CLayer2d.hxx>
#include <Aspect_Handle.hxx>
#include <Aspect_PrintAlgo.hxx>
#include <Aspect_PolygonOffsetMode.hxx>
@ -156,14 +155,10 @@ public:
Standard_Integer ActiveViewId() const { return myViewId; }
//! Redraw the window.
Standard_EXPORT virtual void Redraw (const Graphic3d_CView& theCView,
const Aspect_CLayer2d& theCUnderLayer,
const Aspect_CLayer2d& theCOverLayer);
Standard_EXPORT virtual void Redraw (const Graphic3d_CView& theCView);
Standard_Boolean SetImmediateModeDrawToFront (const Standard_Boolean theDrawToFrontBuffer);
Standard_EXPORT virtual void RedrawImmediate (const Graphic3d_CView& theCView,
const Aspect_CLayer2d& theCUnderLayer,
const Aspect_CLayer2d& theCOverLayer);
Standard_EXPORT virtual void RedrawImmediate (const Graphic3d_CView& theCView);
//! Mark cached view content invalid (e.g. complete view redraw should be performed on next frame).
void Invalidate() { myBackBufferRestored = Standard_False; }
@ -175,8 +170,6 @@ public:
//! System-specific and currently only Win platform implemented.
Standard_Boolean Print (const Handle(OpenGl_PrinterContext)& thePrintContext,
const Graphic3d_CView& theCView,
const Aspect_CLayer2d& theCUnderLayer,
const Aspect_CLayer2d& theCOverLayer,
const Aspect_Handle theHPrintDC,
const Standard_Boolean theToShowBackground,
const Standard_CString theFileName,
@ -307,8 +300,6 @@ protected:
Standard_EXPORT virtual Standard_Boolean Activate();
void redraw1 (const Graphic3d_CView& theCView,
const Aspect_CLayer2d& theCUnderLayer,
const Aspect_CLayer2d& theCOverLayer,
OpenGl_FrameBuffer* theReadDrawFbo,
const Graphic3d_Camera::Projection theProjection);
@ -327,8 +318,6 @@ protected:
//!
//! @return false if immediate structures has been rendered directly into FrontBuffer and Buffer Swap should not be called.
bool redrawImmediate (const Graphic3d_CView& theCView,
const Aspect_CLayer2d& theCUnderLayer,
const Aspect_CLayer2d& theCOverLayer,
OpenGl_FrameBuffer* theReadFbo,
const Graphic3d_Camera::Projection theProjection,
OpenGl_FrameBuffer* theDrawFbo,

10
src/OpenGl/OpenGl_Workspace_2.cxx
View File

@ -274,8 +274,6 @@ static void initBufferTiling (Standard_Integer& theFrameWidth,
Standard_Boolean OpenGl_Workspace::Print
(const Handle(OpenGl_PrinterContext)& thePrintContext,
const Graphic3d_CView& ACView,
const Aspect_CLayer2d& ACUnderLayer,
const Aspect_CLayer2d& ACOverLayer,
const Aspect_Handle hPrintDC,// const Aspect_Drawable hPrintDC,
const Standard_Boolean showBackground,
const Standard_CString filename,
@ -570,13 +568,13 @@ Standard_Boolean OpenGl_Workspace::Print
{
myPrintContext->SetScale ((GLfloat )aFrameWidth /viewWidth,
(GLfloat )aFrameHeight/viewHeight);
redraw1 (ACView, ACUnderLayer, ACOverLayer, aFrameBuffer, aProjectType);
redraw1 (ACView, aFrameBuffer, aProjectType);
if (!myTransientDrawToFront)
{
// render to FBO only if allowed to render to back buffer
myBackBufferRestored = Standard_True;
myIsImmediateDrawn = Standard_False;
redrawImmediate (ACView, ACUnderLayer, ACOverLayer, NULL, aProjectType, aFrameBuffer);
redrawImmediate (ACView, NULL, aProjectType, aFrameBuffer);
myBackBufferRestored = Standard_False;
myIsImmediateDrawn = Standard_False;
}
@ -684,13 +682,13 @@ Standard_Boolean OpenGl_Workspace::Print
aFrameHeight;
// draw to the offscreen buffer and capture the result
redraw1 (ACView, ACUnderLayer, ACOverLayer, aFrameBuffer, aProjectType);
redraw1 (ACView, aFrameBuffer, aProjectType);
if (!myTransientDrawToFront)
{
// render to FBO only if forces to render to back buffer
myBackBufferRestored = Standard_True;
myIsImmediateDrawn = Standard_False;
redrawImmediate (ACView, ACUnderLayer, ACOverLayer, NULL, aProjectType, aFrameBuffer);
redrawImmediate (ACView, NULL, aProjectType, aFrameBuffer);
myBackBufferRestored = Standard_False;
myIsImmediateDrawn = Standard_False;
}

1
src/PrsMgr/PrsMgr_PresentationManager.cxx
View File

@ -28,7 +28,6 @@
#include <Standard_Type.hxx>
#include <TColStd_ListIteratorOfListOfTransient.hxx>
#include <V3d_View.hxx>
#include <Visual3d_Layer.hxx>
#include <Visual3d_View.hxx>
#include <Visual3d_ViewManager.hxx>

4
src/V3d/FILES
View File

@ -8,10 +8,6 @@ V3d_CircularGrid.hxx
V3d_Coordinate.hxx
V3d_DirectionalLight.cxx
V3d_DirectionalLight.hxx
V3d_LayerMgr.cxx
V3d_LayerMgr.hxx
V3d_LayerMgr.lxx
V3d_LayerMgrPointer.hxx
V3d_Light.cxx
V3d_Light.hxx
V3d_ListOfTransient.hxx

82
src/V3d/V3d_LayerMgr.cxx
View File

@ -1,82 +0,0 @@
// Created on: 2008-04-17
// Created by: Customer Support
// Copyright (c) 2008-2014 OPEN CASCADE SAS
//
// This file is part of Open CASCADE Technology software library.
//
// This library is free software; you can redistribute it and/or modify it under
// the terms of the GNU Lesser General Public License version 2.1 as published
// by the Free Software Foundation, with special exception defined in the file
// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
// distribution for complete text of the license and disclaimer of any warranty.
//
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#include <Aspect_Window.hxx>
#include <Font_NameOfFont.hxx>
#include <Standard_Type.hxx>
#include <V3d_LayerMgr.hxx>
#include <V3d_View.hxx>
#include <Visual3d_Layer.hxx>
#include <Visual3d_View.hxx>
V3d_LayerMgr::V3d_LayerMgr( const Handle(V3d_View)& AView )
: myView(AView.operator->())
{
Handle(Visual3d_View) theView = View()->View();
if ( !theView.IsNull() ) {
Handle(Visual3d_ViewManager) theViewMgr = theView->ViewManager();
if ( !theViewMgr.IsNull() ) {
V3d_LayerMgr* that = (V3d_LayerMgr*)this;
that->myOverlay = new Visual3d_Layer( theViewMgr, Aspect_TOL_OVERLAY, Standard_False );
}
}
}
void V3d_LayerMgr::Compute()
{
if (Begin())
{
Redraw();
End();
}
}
void V3d_LayerMgr::Resized()
{
Compute();
}
Standard_Boolean V3d_LayerMgr::Begin()
{
if ( myOverlay.IsNull() )
return Standard_False;
const Handle(Aspect_Window) &theWin = View()->Window();
if ( theWin.IsNull() )
return Standard_False;
Standard_Integer aW( 0 ), aH( 0 );
theWin->Size( aW, aH );
myOverlay->Clear();
myOverlay->SetViewport( aW, aH ); //szv:!!!
myOverlay->Begin();
myOverlay->SetTextAttributes( Font_NOF_ASCII_MONO, Aspect_TODT_NORMAL, Quantity_Color() );
myOverlay->SetOrtho( 0, Max( aW, aH ), Max( aW, aH ), 0, Aspect_TOC_TOP_LEFT );
return Standard_True;
}
void V3d_LayerMgr::Redraw()
{
}
void V3d_LayerMgr::End()
{
if ( !myOverlay.IsNull() )
myOverlay->End();
}

88
src/V3d/V3d_LayerMgr.hxx
View File

@ -1,88 +0,0 @@
// Created on: 2008-04-17
// Created by: Customer Support
// Copyright (c) 2008-2014 OPEN CASCADE SAS
//
// This file is part of Open CASCADE Technology software library.
//
// This library is free software; you can redistribute it and/or modify it under
// the terms of the GNU Lesser General Public License version 2.1 as published
// by the Free Software Foundation, with special exception defined in the file
// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
// distribution for complete text of the license and disclaimer of any warranty.
//
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#ifndef _V3d_LayerMgr_HeaderFile
#define _V3d_LayerMgr_HeaderFile
#include <Standard.hxx>
#include <Standard_Type.hxx>
#include <V3d_ViewPointer.hxx>
#include <MMgt_TShared.hxx>
#include <Standard_Boolean.hxx>
class Visual3d_Layer;
class V3d_ColorScale;
class V3d_ColorScaleLayerItem;
class V3d_View;
class Aspect_ColorScale;
class V3d_LayerMgr;
DEFINE_STANDARD_HANDLE(V3d_LayerMgr, MMgt_TShared)
//! Class to manage layers
class V3d_LayerMgr : public MMgt_TShared
{
public:
Standard_EXPORT V3d_LayerMgr(const Handle(V3d_View)& aView);
const Handle(Visual3d_Layer)& Overlay() const;
Handle(V3d_View) View() const;
//! Recompute layer with objects
Standard_EXPORT void Compute();
Standard_EXPORT void Resized();
DEFINE_STANDARD_RTTI(V3d_LayerMgr,MMgt_TShared)
protected:
//! Begin layers recomputation
Standard_EXPORT virtual Standard_Boolean Begin();
//! Perform layers recomputation
Standard_EXPORT virtual void Redraw();
//! End layers recomputation
Standard_EXPORT virtual void End();
V3d_ViewPointer myView;
Handle(Visual3d_Layer) myOverlay;
private:
};
#include <V3d_LayerMgr.lxx>
#endif // _V3d_LayerMgr_HeaderFile

24
src/V3d/V3d_LayerMgr.lxx
View File

@ -1,24 +0,0 @@
// Created on: 2008-04-17
// Created by: Customer Support
// Copyright (c) 2008-2014 OPEN CASCADE SAS
//
// This file is part of Open CASCADE Technology software library.
//
// This library is free software; you can redistribute it and/or modify it under
// the terms of the GNU Lesser General Public License version 2.1 as published
// by the Free Software Foundation, with special exception defined in the file
// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
// distribution for complete text of the license and disclaimer of any warranty.
//
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
inline const Handle(Visual3d_Layer)& V3d_LayerMgr::Overlay() const
{
return myOverlay;
}
inline Handle(V3d_View) V3d_LayerMgr::View() const
{
return Handle(V3d_View)(myView);
}

23
src/V3d/V3d_LayerMgrPointer.hxx
View File

@ -1,23 +0,0 @@
// Created on: 1992-11-13
// Created by: GG
// Copyright (c) 1992-1999 Matra Datavision
// Copyright (c) 1999-2014 OPEN CASCADE SAS
//
// This file is part of Open CASCADE Technology software library.
//
// This library is free software; you can redistribute it and/or modify it under
// the terms of the GNU Lesser General Public License version 2.1 as published
// by the Free Software Foundation, with special exception defined in the file
// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
// distribution for complete text of the license and disclaimer of any warranty.
//
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#ifndef _V3d_LayerMgrPointer_HeaderFile
#define _V3d_LayerMgrPointer_HeaderFile
class V3d_LayerMgr;
typedef V3d_LayerMgr* V3d_LayerMgrPointer;
#endif // _V3d_LayerMgrPointer_HeaderFile

14
src/V3d/V3d_View.cxx
View File

@ -96,13 +96,11 @@ To solve the problem (for lack of a better solution) I make 2 passes.
#include <TColStd_HSequenceOfInteger.hxx>
#include <V3d.hxx>
#include <V3d_BadValue.hxx>
#include <V3d_LayerMgr.hxx>
#include <V3d_Light.hxx>
#include <V3d_StereoDumpOptions.hxx>
#include <V3d_UnMapped.hxx>
#include <V3d_View.hxx>
#include <V3d_Viewer.hxx>
#include <Visual3d_Layer.hxx>
#include <Visual3d_Light.hxx>
#include <Visual3d_View.hxx>
#include <Visual3d_ViewManager.hxx>
@ -464,9 +462,6 @@ void V3d_View::DoMapping()
//=============================================================================
void V3d_View::MustBeResized()
{
if ( !MyLayerMgr.IsNull() )
MyLayerMgr->Resized();
if( MyView->IsDefined() ) {
MyView->Resized() ;
MyView->Redraw();
@ -496,9 +491,6 @@ void V3d_View::SetBackgroundColor(const Quantity_Color &Color)
MyBackground.SetColor( Color );
if ( MyView->IsDefined() )
MyView->SetBackground( MyBackground );
//szv: Why?
if ( !MyLayerMgr.IsNull() )
MyLayerMgr->Resized();
}
//=============================================================================
@ -2921,12 +2913,6 @@ Standard_Boolean V3d_View::ToPixMap (Image_PixMap& theImage,
myCamera->SetAspect ((Standard_Real) aFBOVPSizeX / aFBOVPSizeY);
}
//workaround for rendering list of Over and Under Layers
if (!MyLayerMgr.IsNull())
{
MyLayerMgr->Compute();
}
Redraw();
if (!aDriver.IsNull())

1
src/V3d/V3d_View.hxx
View File

@ -1058,7 +1058,6 @@ private:
Standard_Integer MyZoomAtPointY;
Handle(Aspect_Grid) MyGrid;
gp_Ax3 MyPlane;
Handle(V3d_LayerMgr) MyLayerMgr;
TColStd_Array2OfReal MyTrsf;
Handle(Graphic3d_Structure) MyGridEchoStructure;
Handle(Graphic3d_Group) MyGridEchoGroup;

1
src/V3d/V3d_View_1.cxx
View File

@ -34,7 +34,6 @@
#include <Standard_MultiplyDefined.hxx>
#include <Standard_TypeMismatch.hxx>
#include <V3d_BadValue.hxx>
#include <V3d_LayerMgr.hxx>
#include <V3d_Light.hxx>
#include <V3d_UnMapped.hxx>
#include <V3d_View.hxx>

1
src/V3d/V3d_View_2.cxx
View File

@ -43,7 +43,6 @@
#include <Standard_TypeMismatch.hxx>
#include <V3d.hxx>
#include <V3d_BadValue.hxx>
#include <V3d_LayerMgr.hxx>
#include <V3d_Light.hxx>
#include <V3d_UnMapped.hxx>
#include <V3d_View.hxx>

1
src/V3d/V3d_View_3.cxx
View File

@ -26,7 +26,6 @@
#include <Standard_MultiplyDefined.hxx>
#include <Standard_TypeMismatch.hxx>
#include <V3d_BadValue.hxx>
#include <V3d_LayerMgr.hxx>
#include <V3d_Light.hxx>
#include <V3d_UnMapped.hxx>
#include <V3d_View.hxx>

1
src/V3d/V3d_View_4.cxx
View File

@ -30,7 +30,6 @@
#include <TColStd_Array2OfReal.hxx>
#include <V3d_BadValue.hxx>
#include <V3d_CircularGrid.hxx>
#include <V3d_LayerMgr.hxx>
#include <V3d_Light.hxx>
#include <V3d_RectangularGrid.hxx>
#include <V3d_UnMapped.hxx>

6
src/V3d/V3d_View_5.cxx
View File

@ -38,7 +38,6 @@
#include <Standard_MultiplyDefined.hxx>
#include <Standard_TypeMismatch.hxx>
#include <V3d_BadValue.hxx>
#include <V3d_LayerMgr.hxx>
#include <V3d_Light.hxx>
#include <V3d_UnMapped.hxx>
#include <V3d_View.hxx>
@ -66,8 +65,3 @@ Graphic3d_RenderingParams& V3d_View::ChangeRenderingParams()
{
return static_cast<Graphic3d_CView*> (MyView->CView())->RenderParams;
}
void V3d_View::SetLayerMgr(const Handle(V3d_LayerMgr)& aMgr)
{
MyLayerMgr = aMgr;
}

1
src/V3d/V3d_View_Print.cxx
View File

@ -39,7 +39,6 @@
#include <Standard_NotImplemented.hxx>
#include <Standard_TypeMismatch.hxx>
#include <V3d_BadValue.hxx>
#include <V3d_LayerMgr.hxx>
#include <V3d_Light.hxx>
#include <V3d_UnMapped.hxx>
#include <V3d_View.hxx>

4
src/ViewerTest/ViewerTest_ViewerCommands.cxx
View File

@ -39,8 +39,6 @@
#include <Visual3d_ViewManager.hxx>
#include <V3d_AmbientLight.hxx>
#include <V3d_DirectionalLight.hxx>
#include <V3d_LayerMgr.hxx>
#include <V3d_LayerMgrPointer.hxx>
#include <V3d_PositionalLight.hxx>
#include <V3d_SpotLight.hxx>
#include <NCollection_DoubleMap.hxx>
@ -59,7 +57,6 @@
#include <TColStd_HSequenceOfReal.hxx>
#include <TColgp_Array1OfPnt2d.hxx>
#include <TColStd_MapOfAsciiString.hxx>
#include <Visual3d_LayerItem.hxx>
#include <Aspect_TypeOfLine.hxx>
#include <Image_Diff.hxx>
#include <Aspect_DisplayConnection.hxx>
@ -79,7 +76,6 @@
#undef DrawText
#endif
#include <Visual3d_Layer.hxx>
#include <cstdlib>
#if defined(_WIN32)

4
src/Visual3d/FILES
View File

@ -7,11 +7,7 @@ Visual3d_ContextView.hxx
Visual3d_DepthCueingDefinitionError.hxx
Visual3d_HSequenceOfLight.hxx
Visual3d_HSequenceOfView.hxx
Visual3d_Layer.cxx
Visual3d_Layer.hxx
Visual3d_LayerDefinitionError.hxx
Visual3d_LayerItem.cxx
Visual3d_LayerItem.hxx
Visual3d_Light.cxx
Visual3d_Light.hxx
Visual3d_LightDefinitionError.hxx

448
src/Visual3d/Visual3d_Layer.cxx
View File

@ -1,448 +0,0 @@
// Copyright (c) 1999-2014 OPEN CASCADE SAS
//
// This file is part of Open CASCADE Technology software library.
//
// This library is free software; you can redistribute it and/or modify it under
// the terms of the GNU Lesser General Public License version 2.1 as published
// by the Free Software Foundation, with special exception defined in the file
// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
// distribution for complete text of the license and disclaimer of any warranty.
//
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
/***********************************************************************
FONCTION :
--------
Classe Visual3d_Layer :
HISTORIQUE DES MODIFICATIONS :
----------------------------
Novembre 1998 : CAL : Creation.
??-??-?? : ??? ;
************************************************************************/
// for the class
#include <Graphic3d_GraphicDriver.hxx>
#include <Graphic3d_TypeOfPrimitive.hxx>
#include <Quantity_Color.hxx>
#include <Standard_Type.hxx>
#include <Visual3d_Layer.hxx>
#include <Visual3d_LayerDefinitionError.hxx>
#include <Visual3d_LayerItem.hxx>
#include <Visual3d_ViewManager.hxx>
//-Aliases
#define MyViewManager ((Visual3d_ViewManager *) MyPtrViewManager)
//-Global data definitions
static Standard_Boolean theLayerState = Standard_False;
static Graphic3d_TypeOfPrimitive theTypeOfPrimitive = Graphic3d_TOP_UNDEFINED;
#define NO_TRACE_CALL
#define NO_DEBUG
//
//-Constructors
//
Visual3d_Layer::Visual3d_Layer (const Handle(Visual3d_ViewManager)& AManager, const Aspect_TypeOfLayer ALayerType, const Standard_Boolean AFlag) {
#ifdef TRACE_CALL
cout << "Visual3d_Layer::Visual3d_Layer" << endl;
#endif
MyPtrViewManager = (void *) AManager.operator->();
MyGraphicDriver = MyViewManager->GraphicDriver();
MyCLayer.layerType = int (ALayerType);
MyCLayer.ptrLayer = NULL;
MyCLayer.ortho[0] = -1.0;
MyCLayer.ortho[1] = 1.0;
MyCLayer.ortho[2] = -1.0;
MyCLayer.ortho[3] = 1.0;
MyCLayer.attach = 0; // Aspect_TOC_BOTTOM_LEFT
MyCLayer.sizeDependent = (AFlag ? 1 : 0);
MyViewManager->SetLayer (this);
MyGraphicDriver->Layer (MyCLayer);
MyCLayer.ptrLayer->layerData = this;
#ifdef OCCT_DEBUG
cout << "Visual3d_Layer::Visual3d_Layer" << endl;
call_def_ptrLayer ptrLayer;
ptrLayer = (call_def_ptrLayer) MyCLayer.ptrLayer;
if (ptrLayer == NULL)
cout << "\tptrLayer == NULL" << endl;
else
cout << "\tptrLayer->listIndex = " << ptrLayer->listIndex << endl;
#endif
}
//
//-Destructors
//
void Visual3d_Layer::Destroy () {
#ifdef TRACE_CALL
cout << "Visual3d_Layer::Destroy" << endl;
#endif
MyGraphicDriver->RemoveLayer (MyCLayer);
}
//-Methods, in order
void Visual3d_Layer::Begin () {
#ifdef TRACE_CALL
cout << "Visual3d_Layer::Begin" << endl;
#endif
if (theLayerState)
Visual3d_LayerDefinitionError::Raise
("Layer is already open !");
MyGraphicDriver->BeginLayer (MyCLayer);
theLayerState = Standard_True;
}
void Visual3d_Layer::End () {
#ifdef TRACE_CALL
cout << "Visual3d_Layer::End" << endl;
#endif
#ifdef OCCT_DEBUG
cout << "Visual3d_Layer::End" << endl;
call_def_ptrLayer ptrLayer;
ptrLayer = (call_def_ptrLayer) MyCLayer.ptrLayer;
if (ptrLayer == NULL)
cout << "\tptrLayer == NULL" << endl;
else
cout << "\tptrLayer->listIndex = " << ptrLayer->listIndex << endl;
#endif
if (! theLayerState)
Visual3d_LayerDefinitionError::Raise
("Layer is not open !");
// Flush all graphics
MyGraphicDriver->EndLayer ();
theLayerState = Standard_False;
#ifdef OCCT_DEBUG
cout << "Visual3d_Layer::End" << endl;
ptrLayer = (call_def_ptrLayer) MyCLayer.ptrLayer;
if (ptrLayer == NULL)
cout << "\tptrLayer == NULL" << endl;
else
cout << "\tptrLayer->listIndex = " << ptrLayer->listIndex << endl;
#endif
}
void Visual3d_Layer::Clear () {
#ifdef TRACE_CALL
cout << "Visual3d_Layer::Clear" << endl;
#endif
if (theLayerState)
Visual3d_LayerDefinitionError::Raise
("Layer is open !");
MyGraphicDriver->ClearLayer (MyCLayer);
}
//
//-Graphic definition methods
//
void Visual3d_Layer::BeginPolyline () {
#ifdef TRACE_CALL
cout << "Visual3d_Layer::BeginPolyline" << endl;
#endif
if (! theLayerState)
Visual3d_LayerDefinitionError::Raise
("Layer is not open !");
if( theTypeOfPrimitive != Graphic3d_TOP_UNDEFINED )
Visual3d_LayerDefinitionError::Raise
("One primitive is already open !");
theTypeOfPrimitive = Graphic3d_TOP_POLYLINE;
MyGraphicDriver->BeginPolyline2d ();
}
void Visual3d_Layer::BeginPolygon () {
#ifdef TRACE_CALL
cout << "Visual3d_Layer::BeginPolygon" << endl;
#endif
if (! theLayerState)
Visual3d_LayerDefinitionError::Raise
("Layer is not open !");
if( theTypeOfPrimitive != Graphic3d_TOP_UNDEFINED )
Visual3d_LayerDefinitionError::Raise
("One primitive is already open !");
theTypeOfPrimitive = Graphic3d_TOP_POLYGON;
MyGraphicDriver->BeginPolygon2d ();
}
void Visual3d_Layer::AddVertex (const Standard_Real X, const Standard_Real Y, const Standard_Boolean AFlag) {
#ifdef TRACE_CALL
cout << "Visual3d_Layer::AddVertex" << endl;
#endif
Standard_ShortReal x = Standard_ShortReal(X);
Standard_ShortReal y = Standard_ShortReal(Y);
switch (theTypeOfPrimitive) {
case Graphic3d_TOP_POLYLINE :
if( AFlag ) MyGraphicDriver->Draw (x, y);
else MyGraphicDriver->Move (x, y);
break;
case Graphic3d_TOP_POLYGON :
MyGraphicDriver->Edge (x, y);
break;
default:
Visual3d_LayerDefinitionError::Raise
("Bad Primitive type!");
}
}
void Visual3d_Layer::ClosePrimitive () {
#ifdef TRACE_CALL
cout << "Visual3d_Layer::ClosePrimitive" << endl;
#endif
switch (theTypeOfPrimitive) {
case Graphic3d_TOP_POLYLINE :
MyGraphicDriver->EndPolyline2d ();
break;
case Graphic3d_TOP_POLYGON :
MyGraphicDriver->EndPolygon2d ();
break;
default:
Visual3d_LayerDefinitionError::Raise
("Bad Primitive type!");
}
theTypeOfPrimitive = Graphic3d_TOP_UNDEFINED;
}
void Visual3d_Layer::DrawRectangle (const Standard_Real X, const Standard_Real Y, const Standard_Real Width, const Standard_Real Height) {
#ifdef TRACE_CALL
cout << "Visual3d_Layer::DrawRectangle" << endl;
#endif
if (! theLayerState)
Visual3d_LayerDefinitionError::Raise
("Layer is not open !");
if (theTypeOfPrimitive != Graphic3d_TOP_UNDEFINED )
Visual3d_LayerDefinitionError::Raise
("One primitive is already open !");
Standard_ShortReal x = Standard_ShortReal (X);
Standard_ShortReal y = Standard_ShortReal (Y);
Standard_ShortReal width = Standard_ShortReal (Width);
Standard_ShortReal height = Standard_ShortReal (Height);
MyGraphicDriver->Rectangle (x, y, width, height);
}
#ifdef WNT
#undef DrawText
#endif
void Visual3d_Layer::DrawText (const Standard_CString AText, const Standard_Real X, const Standard_Real Y, const Standard_Real AHeight) {
#ifdef TRACE_CALL
cout << "Visual3d_Layer::DrawText" << endl;
#endif
if (! theLayerState)
Visual3d_LayerDefinitionError::Raise
("Layer is not open !");
if (theTypeOfPrimitive != Graphic3d_TOP_UNDEFINED )
Visual3d_LayerDefinitionError::Raise
("One primitive is already open !");
Standard_ShortReal x = Standard_ShortReal (X);
Standard_ShortReal y = Standard_ShortReal (Y);
Standard_ShortReal height = Standard_ShortReal (AHeight);
MyGraphicDriver->Text (AText, x, y, height);
}
void Visual3d_Layer::SetColor (const Quantity_Color& AColor) {
#ifdef TRACE_CALL
cout << "Visual3d_Layer::SetColor" << endl;
#endif
if (! theLayerState)
Visual3d_LayerDefinitionError::Raise
("Layer is not open !");
Standard_ShortReal r = Standard_ShortReal (AColor.Red());
Standard_ShortReal g = Standard_ShortReal (AColor.Green());
Standard_ShortReal b = Standard_ShortReal (AColor.Blue());
#ifdef TRACE_CALL
cout << "\tSetColor : " << r << ", " << g << ", " << b << endl;
#endif
MyGraphicDriver->SetColor (r, g, b);
}
void Visual3d_Layer::SetTransparency (const Standard_ShortReal ATransparency) {
#ifdef TRACE_CALL
cout << "Visual3d_Layer::SetTransparency" << endl;
#endif
if (! theLayerState)
Visual3d_LayerDefinitionError::Raise
("Layer is not open !");
#ifdef TRACE_CALL
cout << "\tSetTransparency : " << ATransparency << endl;
#endif
MyGraphicDriver->SetTransparency (ATransparency);
}
void Visual3d_Layer::UnsetTransparency () {
#ifdef TRACE_CALL
cout << "Visual3d_Layer::UnsetTransparency" << endl;
#endif
if (! theLayerState)
Visual3d_LayerDefinitionError::Raise
("Layer is not open !");
#ifdef TRACE_CALL
cout << "\tUnsetTransparency" << endl;
#endif
MyGraphicDriver->UnsetTransparency ();
}
#ifdef WNT
#undef DrawText
#endif
void Visual3d_Layer::TextSize (const Standard_CString AText, const Standard_Real AHeight, Standard_Real& AWidth, Standard_Real& AnAscent, Standard_Real& ADescent) const {
Standard_ShortReal aWidth, anAscent, aDescent;
#ifdef TRACE_CALL
cout << "Visual3d_Layer::TextSize" << endl;
#endif
if (! theLayerState)
Visual3d_LayerDefinitionError::Raise
("Layer is not open !");
if (theTypeOfPrimitive != Graphic3d_TOP_UNDEFINED )
Visual3d_LayerDefinitionError::Raise
("One primitive is already open !");
MyGraphicDriver->TextSize (AText, (Standard_ShortReal)AHeight, aWidth, anAscent, aDescent);
AWidth = aWidth;
AnAscent = anAscent;
ADescent = aDescent;
}
void Visual3d_Layer::SetLineAttributes (const Aspect_TypeOfLine AType, const Standard_Real AWidth) {
#ifdef TRACE_CALL
cout << "Visual3d_Layer::SetLineAttributes" << endl;
#endif
if (! theLayerState)
Visual3d_LayerDefinitionError::Raise
("Layer is not open !");
Standard_Integer type = AType;
Standard_ShortReal width = Standard_ShortReal (AWidth);
#ifdef TRACE_CALL
cout << "\tSetLineAttributes : " << type << ", " << width << endl;
#endif
MyGraphicDriver->SetLineAttributes (type, width);
}
void Visual3d_Layer::SetTextAttributes (const Standard_CString AFont, const Aspect_TypeOfDisplayText AType, const Quantity_Color& AColor) {
#ifdef TRACE_CALL
cout << "Visual3d_Layer::SetTextAttributes" << endl;
#endif
if (! theLayerState)
Visual3d_LayerDefinitionError::Raise
("Layer is not open !");
Standard_CString font = (char*)AFont;
Standard_Integer type = AType;
Standard_ShortReal r = Standard_ShortReal (AColor.Red());
Standard_ShortReal g = Standard_ShortReal (AColor.Green());
Standard_ShortReal b = Standard_ShortReal (AColor.Blue());
#ifdef TRACE_CALL
cout << "\tSetTextAttributes : " << font << ", " << type << endl;
cout << "\t " << r << ", " << g << ", " << b << endl;
#endif
MyGraphicDriver->SetTextAttributes (font, type, r, g, b);
}
void Visual3d_Layer::SetOrtho (const Standard_Real Left, const Standard_Real Right, const Standard_Real Bottom, const Standard_Real Top, const Aspect_TypeOfConstraint Attach) {
#ifdef TRACE_CALL
cout << "Visual3d_Layer::SetOrtho" << endl;
#endif
MyCLayer.ortho[0] = Standard_ShortReal (Left);
MyCLayer.ortho[1] = Standard_ShortReal (Right);
MyCLayer.ortho[2] = Standard_ShortReal (Bottom);
MyCLayer.ortho[3] = Standard_ShortReal (Top);
MyCLayer.attach = Standard_Integer (Attach);
}
void Visual3d_Layer::SetViewport (const Standard_Integer Width, const Standard_Integer Height) {
#ifdef TRACE_CALL
cout << "Visual3d_Layer::SetViewport" << endl;
#endif
MyCLayer.viewport[0] = float (Width);
MyCLayer.viewport[1] = float (Height);
}
Aspect_CLayer2d Visual3d_Layer::CLayer () const {
#ifdef TRACE_CALL
cout << "Visual3d_Layer::CLayer" << endl;
#endif
#ifdef OCCT_DEBUG
cout << "Visual3d_Layer::CLayer" << endl;
call_def_ptrLayer ptrLayer;
ptrLayer = (call_def_ptrLayer) MyCLayer.ptrLayer;
if (ptrLayer == NULL)
cout << "\tptrLayer == NULL" << endl;
else
cout << "\tptrLayer->listIndex = " << ptrLayer->listIndex << endl;
#endif
return MyCLayer;
}
Aspect_TypeOfLayer Visual3d_Layer::Type () const {
#ifdef TRACE_CALL
cout << "Visual3d_Layer::Type" << endl;
#endif
return Aspect_TypeOfLayer (MyCLayer.layerType);
}
void Visual3d_Layer::AddLayerItem( const Handle(Visual3d_LayerItem)& Item )
{
MyListOfLayerItems.Append( Item );
}
void Visual3d_Layer::RemoveLayerItem( const Handle(Visual3d_LayerItem)& Item )
{
if ( MyListOfLayerItems.IsEmpty() )
return;
Visual3d_NListOfLayerItem::Iterator it( MyListOfLayerItems );
for( ; it.More(); it.Next() ) {
if ( it.Value() == Item ) {
MyListOfLayerItems.Remove( it );
break;
}
}
}
void Visual3d_Layer::RemoveAllLayerItems()
{
MyListOfLayerItems.Clear();
}
const Visual3d_NListOfLayerItem& Visual3d_Layer::GetLayerItemList() const
{
return MyListOfLayerItems;
}
void Visual3d_Layer::RenderLayerItems() const
{
theLayerState = Standard_True;
const Visual3d_NListOfLayerItem& items = GetLayerItemList();
Visual3d_NListOfLayerItem::Iterator it(items);
for(; it.More(); it.Next() ) {
it.Value()->RedrawLayerPrs();
}
theLayerState = Standard_False;
}

190
src/Visual3d/Visual3d_Layer.hxx
View File

@ -1,190 +0,0 @@
// Created by: CAL
// Copyright (c) 1998-1999 Matra Datavision
// Copyright (c) 1999-2014 OPEN CASCADE SAS
//
// This file is part of Open CASCADE Technology software library.
//
// This library is free software; you can redistribute it and/or modify it under
// the terms of the GNU Lesser General Public License version 2.1 as published
// by the Free Software Foundation, with special exception defined in the file
// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
// distribution for complete text of the license and disclaimer of any warranty.
//
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#ifndef _Visual3d_Layer_HeaderFile
#define _Visual3d_Layer_HeaderFile
#include <Standard.hxx>
#include <Standard_Type.hxx>
#include <Aspect_CLayer2d.hxx>
#include <Standard_Address.hxx>
#include <Visual3d_NListOfLayerItem.hxx>
#include <MMgt_TShared.hxx>
#include <Aspect_TypeOfLayer.hxx>
#include <Standard_Boolean.hxx>
#include <Standard_Real.hxx>
#include <Standard_CString.hxx>
#include <Standard_ShortReal.hxx>
#include <Aspect_TypeOfLine.hxx>
#include <Aspect_TypeOfDisplayText.hxx>
#include <Aspect_TypeOfConstraint.hxx>
#include <Standard_Integer.hxx>
class Graphic3d_GraphicDriver;
class Visual3d_LayerDefinitionError;
class Visual3d_ViewManager;
class Quantity_Color;
class Visual3d_LayerItem;
class Visual3d_Layer;
DEFINE_STANDARD_HANDLE(Visual3d_Layer, MMgt_TShared)
//! This class allows to manage 2d graphics.
class Visual3d_Layer : public MMgt_TShared
{
public:
//! Creates a layer with the type <Atype>.
//! if <AFlag> == Standard_True then the layer is
//! "size dependent".
//! The mapping of the layer is dependent of each
//! window's size.
//! if <AFlag> == Standard_False then the mapping of the
//! layer is dependent of the highest window and the largest
//! window of all the views of the viewer <AViewer>.
//! When the viewer <AViewer> have only one view, the
//! result will be the same with <AFlag> == Standard_False
//! or <AFlag> == Standard_True.
Standard_EXPORT Visual3d_Layer(const Handle(Visual3d_ViewManager)& AViewer, const Aspect_TypeOfLayer AType = Aspect_TOL_OVERLAY, const Standard_Boolean AFlag = Standard_False);
//! Suppress the layer <me>.
Standard_EXPORT void Destroy();
~Visual3d_Layer()
{
Destroy();
}
//! Begins the definition of the layer <me>
//! Warning: No default attributes
Standard_EXPORT void Begin();
//! Finishs the definition of the layer <me>.
Standard_EXPORT void End();
//! Clear all graphics managed by the layer <me>.
Standard_EXPORT void Clear();
//! After this call, <me> is ready to receive
//! a definition of a polyline with AddVertex().
Standard_EXPORT void BeginPolyline();
//! After this call, <me> is ready to receive
//! a definition of a polygon with AddEdge().
Standard_EXPORT void BeginPolygon();
//! Puts <X, Y> as a new point in the current primitive.
//! If <AFlag> then it is a draw between last point and
//! this point else it is a move between last point and
//! this point.
Standard_EXPORT void AddVertex (const Standard_Real X, const Standard_Real Y, const Standard_Boolean AFlag = Standard_True);
//! After this call, <me> stops the reception of
//! a definition of a Begin... primitive.
Standard_EXPORT void ClosePrimitive();
//! Draws the rectangle at position <X,Y>.
Standard_EXPORT void DrawRectangle (const Standard_Real X, const Standard_Real Y, const Standard_Real Width, const Standard_Real Height);
//! Draws the string <AText> at position <X,Y>.
//! The attributes are given with respect to the plane of
//! projection.
//! <AHeight> : Height of text.
//! (Relative to the Normalized Projection
//! Coordinates (NPC) Space).
Standard_EXPORT void DrawText (const Standard_CString AText, const Standard_Real X, const Standard_Real Y, const Standard_Real AHeight);
//! Get the size of text.
//! The attributes are given with respect to the plane of
//! projection.
//! <AHeight> : Height of text.
//! (Relative to the Normalized Projection
//! Coordinates (NPC) Space).
Standard_EXPORT void TextSize (const Standard_CString AText, const Standard_Real AHeight, Standard_Real& AWidth, Standard_Real& AnAscent, Standard_Real& ADescent) const;
//! Modifies the current color.
//! Warning: No default color
Standard_EXPORT void SetColor (const Quantity_Color& AColor);
//! Modifies the current transparency.
//! Warning: No default transparency
Standard_EXPORT void SetTransparency (const Standard_ShortReal ATransparency);
//! Unsets the transparency.
Standard_EXPORT void UnsetTransparency();
//! Modifies the current lines attributes.
//! Warning: No default attributes
Standard_EXPORT void SetLineAttributes (const Aspect_TypeOfLine AType, const Standard_Real AWidth);
//! Modifies the current texts attributes.
//! <AFont> defines the name of the font to be used.
//! <AType> defines the display type of the text.
//! <AColor> defines the color of decal or subtitle background.
//! To set the color of the text you can use the SetColor method.
//! Warning: No default attributes
Standard_EXPORT void SetTextAttributes (const Standard_CString AFont, const Aspect_TypeOfDisplayText AType, const Quantity_Color& AColor);
//! Modifies the current coordinates system of the layer <me>.
Standard_EXPORT void SetOrtho (const Standard_Real Left, const Standard_Real Right, const Standard_Real Bottom, const Standard_Real Top, const Aspect_TypeOfConstraint Attach = Aspect_TOC_BOTTOM_LEFT);
//! Modifies the current viewport of the layer <me>.
Standard_EXPORT void SetViewport (const Standard_Integer Width, const Standard_Integer Height);
//! Returns the associated C structure.
Standard_EXPORT Aspect_CLayer2d CLayer() const;
//! Returns the type.
Standard_EXPORT Aspect_TypeOfLayer Type() const;
Standard_EXPORT void AddLayerItem (const Handle(Visual3d_LayerItem)& Item);
Standard_EXPORT void RemoveLayerItem (const Handle(Visual3d_LayerItem)& Item);
Standard_EXPORT void RemoveAllLayerItems();
Standard_EXPORT const Visual3d_NListOfLayerItem& GetLayerItemList() const;
Standard_EXPORT void RenderLayerItems() const;
DEFINE_STANDARD_RTTI(Visual3d_Layer,MMgt_TShared)
protected:
private:
Handle(Graphic3d_GraphicDriver) MyGraphicDriver;
Aspect_CLayer2d MyCLayer;
Standard_Address MyPtrViewManager;
Visual3d_NListOfLayerItem MyListOfLayerItems;
};
#endif // _Visual3d_Layer_HeaderFile

48
src/Visual3d/Visual3d_LayerItem.cxx
View File

@ -1,48 +0,0 @@
// Copyright (c) 1999-2014 OPEN CASCADE SAS
//
// This file is part of Open CASCADE Technology software library.
//
// This library is free software; you can redistribute it and/or modify it under
// the terms of the GNU Lesser General Public License version 2.1 as published
// by the Free Software Foundation, with special exception defined in the file
// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
// distribution for complete text of the license and disclaimer of any warranty.
//
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
/***********************************************************************
************************************************************************/
// for the class
#include <Standard_Type.hxx>
#include <Visual3d_LayerItem.hxx>
//
//-Constructors
//
Visual3d_LayerItem::Visual3d_LayerItem() :
MyIsNeedToRecompute(Standard_False)
{
}
void Visual3d_LayerItem::ComputeLayerPrs()
{
SetNeedToRecompute( Standard_False );
}
void Visual3d_LayerItem::RedrawLayerPrs()
{
if ( IsNeedToRecompute() )
ComputeLayerPrs();
}
Standard_Boolean Visual3d_LayerItem::IsNeedToRecompute() const
{
return MyIsNeedToRecompute;
}
void Visual3d_LayerItem::SetNeedToRecompute( const Standard_Boolean flag )
{
MyIsNeedToRecompute = flag;
}

75
src/Visual3d/Visual3d_LayerItem.hxx
View File

@ -1,75 +0,0 @@
// Created on: 2009-03-20
// Created by: ABD
// Copyright (c) 2009-2014 OPEN CASCADE SAS
//
// This file is part of Open CASCADE Technology software library.
//
// This library is free software; you can redistribute it and/or modify it under
// the terms of the GNU Lesser General Public License version 2.1 as published
// by the Free Software Foundation, with special exception defined in the file
// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
// distribution for complete text of the license and disclaimer of any warranty.
//
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#ifndef _Visual3d_LayerItem_HeaderFile
#define _Visual3d_LayerItem_HeaderFile
#include <Standard.hxx>
#include <Standard_Type.hxx>
#include <Standard_Boolean.hxx>
#include <MMgt_TShared.hxx>
class Visual3d_LayerItem;
DEFINE_STANDARD_HANDLE(Visual3d_LayerItem, MMgt_TShared)
//! This class is drawable unit of 2d scene
class Visual3d_LayerItem : public MMgt_TShared
{
public:
//! Creates a layer item
Standard_EXPORT Visual3d_LayerItem();
//! virtual function for recompute 2D
//! presentation (empty by default)
Standard_EXPORT virtual void ComputeLayerPrs();
//! virtual function for recompute 2D
//! presentation (empty by default)
Standard_EXPORT virtual void RedrawLayerPrs();
Standard_EXPORT Standard_Boolean IsNeedToRecompute() const;
Standard_EXPORT void SetNeedToRecompute (const Standard_Boolean NeedToRecompute = Standard_True);
DEFINE_STANDARD_RTTI(Visual3d_LayerItem,MMgt_TShared)
protected:
private:
Standard_Boolean MyIsNeedToRecompute;
};
#endif // _Visual3d_LayerItem_HeaderFile

125
src/Visual3d/Visual3d_View.cxx
View File

@ -34,7 +34,6 @@
#include <TColStd_HArray2OfReal.hxx>
#include <Visual3d_ContextView.hxx>
#include <Visual3d_DepthCueingDefinitionError.hxx>
#include <Visual3d_Layer.hxx>
#include <Visual3d_Light.hxx>
#include <Visual3d_TransformError.hxx>
#include <Visual3d_View.hxx>
@ -918,39 +917,14 @@ void Visual3d_View::Deactivate()
// =======================================================================
void Visual3d_View::Redraw()
{
Redraw (myViewManager->UnderLayer(), myViewManager->OverLayer(), 0, 0, 0, 0);
Redraw (0, 0, 0, 0);
}
// =======================================================================
// function : Redraw
// purpose :
// =======================================================================
void Visual3d_View::Redraw (const Standard_Integer theX,
const Standard_Integer theY,
const Standard_Integer theWidth,
const Standard_Integer theHeight)
{
Redraw (myViewManager->UnderLayer(), myViewManager->OverLayer(),
theX, theY, theWidth, theHeight);
}
// =======================================================================
// function : Redraw
// purpose :
// =======================================================================
void Visual3d_View::Redraw (const Handle(Visual3d_Layer)& theUnderLayer,
const Handle(Visual3d_Layer)& theOverLayer)
{
Redraw (theUnderLayer, theOverLayer, 0, 0, 0, 0);
}
// =======================================================================
// function : Redraw
// purpose :
// =======================================================================
void Visual3d_View::Redraw (const Handle(Visual3d_Layer)& theUnderLayer,
const Handle(Visual3d_Layer)& theOverLayer,
const Standard_Integer theX,
void Visual3d_View::Redraw (const Standard_Integer theX,
const Standard_Integer theY,
const Standard_Integer theWidth,
const Standard_Integer theHeight)
@ -963,11 +937,6 @@ void Visual3d_View::Redraw (const Handle(Visual3d_Layer)& theUnderLayer,
return;
}
Aspect_CLayer2d anOverCLayer, anUnderCLayer;
anOverCLayer.ptrLayer = anUnderCLayer.ptrLayer = NULL;
if (!theOverLayer .IsNull()) anOverCLayer = theOverLayer ->CLayer();
if (!theUnderLayer.IsNull()) anUnderCLayer = theUnderLayer->CLayer();
for (Standard_Integer aRetryIter = 0; aRetryIter < 2; ++aRetryIter)
{
if (myGraphicDriver->IsDeviceLost())
@ -982,7 +951,7 @@ void Visual3d_View::Redraw (const Handle(Visual3d_Layer)& theUnderLayer,
myStructuresUpdated = Standard_False;
}
myGraphicDriver->Redraw (MyCView, anUnderCLayer, anOverCLayer, theX, theY, theWidth, theHeight);
myGraphicDriver->Redraw (MyCView, theX, theY, theWidth, theHeight);
if (!myGraphicDriver->IsDeviceLost())
{
return;
@ -994,17 +963,7 @@ void Visual3d_View::Redraw (const Handle(Visual3d_Layer)& theUnderLayer,
// function : RedrawImmediate
// purpose :
// =======================================================================
void Visual3d_View::RedrawImmediate()
{
RedrawImmediate (myViewManager->UnderLayer(), myViewManager->OverLayer());
}
// =======================================================================
// function : RedrawImmediate
// purpose :
// =======================================================================
void Visual3d_View::RedrawImmediate (const Handle(Visual3d_Layer)& theUnderLayer,
const Handle(Visual3d_Layer)& theOverLayer)
void Visual3d_View::RedrawImmediate ()
{
if (IsDeleted()
|| !IsDefined()
@ -1014,11 +973,7 @@ void Visual3d_View::RedrawImmediate (const Handle(Visual3d_Layer)& theUnderLayer
return;
}
Aspect_CLayer2d anOverCLayer, anUnderCLayer;
anOverCLayer.ptrLayer = anUnderCLayer.ptrLayer = NULL;
if (!theOverLayer .IsNull()) anOverCLayer = theOverLayer ->CLayer();
if (!theUnderLayer.IsNull()) anUnderCLayer = theUnderLayer->CLayer();
myGraphicDriver->RedrawImmediate (MyCView, anUnderCLayer, anOverCLayer);
myGraphicDriver->RedrawImmediate (MyCView);
}
// =======================================================================
@ -1049,7 +1004,7 @@ void Visual3d_View::Update (Aspect_TypeOfUpdate theUpdateMode)
if (theUpdateMode == Aspect_TOU_ASAP)
{
Compute();
Redraw (myViewManager->UnderLayer(), myViewManager->OverLayer(), 0, 0, 0, 0);
Redraw (0, 0, 0, 0);
}
}
@ -1057,12 +1012,11 @@ void Visual3d_View::Update (Aspect_TypeOfUpdate theUpdateMode)
// function : Update
// purpose :
// =======================================================================
void Visual3d_View::Update (const Handle(Visual3d_Layer)& theUnderLayer,
const Handle(Visual3d_Layer)& theOverLayer)
void Visual3d_View::Update ()
{
Compute();
myStructuresUpdated = Standard_True;
Redraw (theUnderLayer, theOverLayer, 0, 0, 0, 0);
Redraw (0, 0, 0, 0);
}
// ========================================================================
@ -2050,24 +2004,6 @@ void Visual3d_View::GraduatedTrihedronErase()
myGraphicDriver->GraduatedTrihedronErase (MyCView);
}
// =======================================================================
// function : UnderLayer
// purpose :
// =======================================================================
const Handle(Visual3d_Layer)& Visual3d_View::UnderLayer() const
{
return myViewManager->UnderLayer();
}
// =======================================================================
// function : OverLayer
// purpose :
// =======================================================================
const Handle(Visual3d_Layer)& Visual3d_View::OverLayer() const
{
return myViewManager->OverLayer();
}
// =======================================================================
// function : LightLimit
// purpose :
@ -2341,23 +2277,11 @@ Standard_Boolean Visual3d_View::Export (const Standard_CString theFileName
const Standard_Address theProgressBarFunc,
const Standard_Address theProgressObject) const
{
Handle(Visual3d_Layer) anUnderLayer = myViewManager->UnderLayer();
Handle(Visual3d_Layer) anOverLayer = myViewManager->OverLayer();
Aspect_CLayer2d anOverCLayer;
Aspect_CLayer2d anUnderCLayer;
anOverCLayer.ptrLayer = anUnderCLayer.ptrLayer = NULL;
if (!anOverLayer.IsNull())
anOverCLayer = anOverLayer->CLayer();
if (!anUnderLayer.IsNull())
anUnderCLayer = anUnderLayer->CLayer();
Standard_Integer aWidth, aHeight;
Window()->Size (aWidth, aHeight);
return myGraphicDriver->Export (theFileName, theFormat, theSortType,
aWidth, aHeight, MyCView, anUnderCLayer, anOverCLayer,
aWidth, aHeight, MyCView,
thePrecision, theProgressBarFunc, theProgressObject);
}
@ -2403,26 +2327,7 @@ void Visual3d_View::ChangeZLayer (const Handle(Graphic3d_Structure)& theStructur
// function : Print
// purpose :
// =======================================================================
Standard_Boolean Visual3d_View::Print (const Aspect_Handle thePrintDC,
const Standard_Boolean theToShowBackground,
const Standard_CString theFilename,
const Aspect_PrintAlgo thePrintAlgorithm,
const Standard_Real theScaleFactor) const
{
return Print (myViewManager->UnderLayer(),
myViewManager->OverLayer(),
thePrintDC, theToShowBackground,
theFilename, thePrintAlgorithm,
theScaleFactor);
}
// =======================================================================
// function : Print
// purpose :
// =======================================================================
Standard_Boolean Visual3d_View::Print (const Handle(Visual3d_Layer)& theUnderLayer,
const Handle(Visual3d_Layer)& theOverLayer,
const Aspect_Handle thePrintDC,
Standard_Boolean Visual3d_View::Print (const Aspect_Handle thePrintDC,
const Standard_Boolean theToShowBackground,
const Standard_CString theFilename,
const Aspect_PrintAlgo thePrintAlgorithm,
@ -2436,14 +2341,8 @@ Standard_Boolean Visual3d_View::Print (const Handle(Visual3d_Layer)& theUnderLay
return Standard_False;
}
Aspect_CLayer2d anOverCLayer;
Aspect_CLayer2d anUnderCLayer;
anOverCLayer.ptrLayer = anUnderCLayer.ptrLayer = NULL;
if (!theOverLayer.IsNull()) anOverCLayer = theOverLayer->CLayer();
if (!theUnderLayer.IsNull()) anUnderCLayer = theUnderLayer->CLayer();
return myGraphicDriver->Print (MyCView, anUnderCLayer, anOverCLayer,
thePrintDC, theToShowBackground, theFilename,
thePrintAlgorithm, theScaleFactor);
return myGraphicDriver->Print (MyCView, thePrintDC, theToShowBackground,
theFilename, thePrintAlgorithm, theScaleFactor);
}
//=============================================================================

34
src/Visual3d/Visual3d_View.hxx
View File

@ -131,21 +131,11 @@ public:
//! area is given by his xy min corner and size in pixel coordinates
Standard_EXPORT void Redraw (const Standard_Integer x, const Standard_Integer y, const Standard_Integer width, const Standard_Integer height);
//! Updates screen in all cases.
Standard_EXPORT void Redraw (const Handle(Visual3d_Layer)& AnUnderLayer, const Handle(Visual3d_Layer)& AnOverLayer);
//! Updates layer of immediate presentations.
Standard_EXPORT void RedrawImmediate (const Handle(Visual3d_Layer)& theUnderLayer, const Handle(Visual3d_Layer)& theOverLayer);
//! Invalidates view content but does not redraw it.
Standard_EXPORT void Invalidate();
//! Returns true if cached view content has been invalidated.
Standard_EXPORT Standard_Boolean IsInvalidated() const;
//! Updates screen area in all cases.
//! area is given by his xy min corner and size in pixel coordinates
Standard_EXPORT void Redraw (const Handle(Visual3d_Layer)& AnUnderLayer, const Handle(Visual3d_Layer)& AnOverLayer, const Standard_Integer x, const Standard_Integer y, const Standard_Integer width, const Standard_Integer height);
//! Deletes and erases the view <me>.
//! Warning: No more graphic operations in <me> after this call.
@ -279,7 +269,7 @@ public:
//! Updates screen in function of modifications of
//! the structures.
Standard_EXPORT void Update (const Handle(Visual3d_Layer)& AnUnderLayer, const Handle(Visual3d_Layer)& AnOverLayer);
Standard_EXPORT void Update ();
//! Sets the automatic z-fit mode and its parameters.
//! The auto z-fit has extra parameters which can controlled from application level
@ -443,22 +433,6 @@ public:
//! Returns the associated GraphicDriver.
Standard_EXPORT const Handle(Graphic3d_GraphicDriver)& GraphicDriver() const;
//! print the contents of all layers of the view to the printer.
//! <hPrnDC> : Pass the PrinterDeviceContext (HDC),
//! <showBackground> : When set to FALSE then print the view without background color
//! (background is white)
//! else set to TRUE for printing with current background color.
//! <filename>: If != NULL, then the view will be printed to a file.
//! <printAlgo>: Select print algorithm: stretch, tile.
//! <theScaleFactor>: Scaling coefficient, used internally to scale the
//! printings accordingly to the scale factor selected in the printer
//! properties dialog.
//! Returns Standard_True if the data is passed to the printer, otherwise
//! Standard_False if the print operation failed due to printer error
//! or insufficient memory.
//! Warning: Works only under Windows.
Standard_EXPORT Standard_Boolean Print (const Handle(Visual3d_Layer)& AnUnderLayer, const Handle(Visual3d_Layer)& AnOverLayer, const Aspect_Handle hPrnDC, const Standard_Boolean showBackground, const Standard_CString filename, const Aspect_PrintAlgo printAlgorithm = Aspect_PA_STRETCH, const Standard_Real theScaleFactor = 1.0) const;
//! print the contents of the view to printer.
//! <hPrnDC> : Pass the PrinterDeviceContext (HDC),
//! <showBackground> : When set to FALSE then print the view without background color
@ -475,12 +449,6 @@ public:
//! Warning: Works only under Windows.
Standard_EXPORT Standard_Boolean Print (const Aspect_Handle hPrnDC, const Standard_Boolean showBackground, const Standard_CString filename, const Aspect_PrintAlgo printAlgorithm = Aspect_PA_STRETCH, const Standard_Real theScaleFactor = 1.0) const;
//! Returns the underlay of the view <me>.
Standard_EXPORT const Handle(Visual3d_Layer)& UnderLayer() const;
//! Returns the underlay of the view <me>.
Standard_EXPORT const Handle(Visual3d_Layer)& OverLayer() const;
//! Reads depths of shown pixels of the given rectangle
Standard_EXPORT void ReadDepths (const Standard_Integer x, const Standard_Integer y, const Standard_Integer width, const Standard_Integer height, const Standard_Address buffer) const;

50
src/Visual3d/Visual3d_ViewManager.cxx
View File

@ -64,7 +64,6 @@
#include <Graphic3d_Structure.hxx>
#include <Standard_ErrorHandler.hxx>
#include <Standard_Type.hxx>
#include <Visual3d_Layer.hxx>
#include <Visual3d_View.hxx>
#include <Visual3d_ViewManager.hxx>
@ -340,32 +339,9 @@ void Visual3d_ViewManager::Redraw() const
return;
}
if (!MyUnderLayer.IsNull() || !MyOverLayer.IsNull())
{
Standard_Integer aWidth = 0, aHeight = 0;
Standard_Integer aWidthMax = 0;
Standard_Integer aHeightMax = 0;
for(int i=1; i<=MyDefinedView.Length(); i++)
{
MyDefinedView.Value(i)->Window()->Size (aWidth, aHeight);
aWidthMax = Max (aWidthMax, aWidth);
aHeightMax = Max (aHeightMax, aHeight);
}
if (!MyUnderLayer.IsNull())
{
MyUnderLayer->SetViewport (aWidthMax, aHeightMax);
}
if (!MyOverLayer.IsNull())
{
MyOverLayer->SetViewport (aWidthMax, aHeightMax);
}
}
for(int i=1; i<=MyDefinedView.Length(); i++)
{
MyDefinedView.Value(i)->Redraw (MyUnderLayer, MyOverLayer);
MyDefinedView.Value(i)->Redraw ();
}
}
@ -384,7 +360,7 @@ void Visual3d_ViewManager::RedrawImmediate() const
// update all activated views
for(int i=1; i<=MyDefinedView.Length(); i++)
{
MyDefinedView.Value(i)->RedrawImmediate (MyUnderLayer, MyOverLayer);
MyDefinedView.Value(i)->RedrawImmediate ();
}
}
@ -582,28 +558,6 @@ Standard_Boolean Visual3d_ViewManager::ZBufferAuto () const
return (MyZBufferAuto);
}
void Visual3d_ViewManager::SetLayer (const Handle(Visual3d_Layer)& ALayer) {
if (ALayer->Type () == Aspect_TOL_OVERLAY) {
MyOverLayer = ALayer;
}
else {
MyUnderLayer = ALayer;
}
}
const Handle(Visual3d_Layer)& Visual3d_ViewManager::UnderLayer () const {
return (MyUnderLayer);
}
const Handle(Visual3d_Layer)& Visual3d_ViewManager::OverLayer () const {
return (MyOverLayer);
}
//=======================================================================
//function : ChangeZLayer
//purpose :

11
src/Visual3d/Visual3d_ViewManager.hxx
View File

@ -187,12 +187,6 @@ public:
//! the associated view.
Standard_EXPORT Standard_Boolean ViewExists (const Handle(Aspect_Window)& AWindow, Graphic3d_CView& TheCView) const;
//! Returns the underlay of the viewer <me>.
Standard_EXPORT const Handle(Visual3d_Layer)& UnderLayer() const;
//! Returns the underlay of the viewer <me>.
Standard_EXPORT const Handle(Visual3d_Layer)& OverLayer() const;
//! Forces a new construction of the structure <AStructure>
//! if <AStructure> is displayed and TOS_COMPUTED.
Standard_EXPORT void ReCompute (const Handle(Graphic3d_Structure)& AStructure) Standard_OVERRIDE;
@ -230,12 +224,7 @@ private:
//! make the layer lists consistent.
Standard_EXPORT void InstallZLayers (const Handle(Visual3d_View)& theView) const;
//! Adds a new layer in all the views of <me>.
Standard_EXPORT void SetLayer (const Handle(Visual3d_Layer)& ALayer);
Visual3d_SequenceOfView MyDefinedView;
Handle(Visual3d_Layer) MyUnderLayer;
Handle(Visual3d_Layer) MyOverLayer;
Aspect_GenId MyViewGenId;
Handle(Graphic3d_GraphicDriver) MyGraphicDriver;
Standard_Boolean MyZBufferAuto;