1
0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-09 13:22:24 +03:00

0023814: Drop plugin interface for Graphic3d_GraphicDriver instantiation

Drop Graphic3d_GraphicDriver::Begin() and ::End() methods.
Initialization is performed within driver constructor.

Drop dummy argument for Graphic3d_GraphicDriver constructor with library name.
Display connection now should be set instead

Drop Graphic3d::InitGraphicDriver() function and Graphic3d.hxx header.
Application code should explicitly link against TKOpenGl toolkit and instantiate OpenGl_GraphicDriver class.

Drop MetaGraphicDriverFactory implementation within TKOpenGl.
This commit is contained in:
kgv
2014-07-03 10:47:42 +04:00
committed by bugmaster
parent 2a40d51c15
commit fe9fc66996
13 changed files with 17 additions and 234 deletions

View File

@@ -4,8 +4,6 @@
//for OCC graphic
#include <Aspect_DisplayConnection.hxx>
#include <WNT_Window.hxx>
#include <Graphic3d.hxx>
#include <Graphic3d_GraphicDRiver.hxx>
#include <OpenGl_GraphicDriver.hxx>
//for object display
#include <V3d_Viewer.hxx>
@@ -703,8 +701,7 @@ public:
myView() = myAISContext()->CurrentViewer()->CreateView();
if (myGraphicDriver().IsNull())
{
Handle(Aspect_DisplayConnection) aDisplayConnection;
myGraphicDriver() = Graphic3d::InitGraphicDriver (aDisplayConnection);
myGraphicDriver() = new OpenGl_GraphicDriver (Handle(Aspect_DisplayConnection)());
}
Handle(WNT_Window) aWNTWindow = new WNT_Window (reinterpret_cast<HWND> (theWnd.ToPointer()));
myView()->SetWindow(aWNTWindow);
@@ -1097,5 +1094,5 @@ private:
NCollection_Haft<Handle_V3d_Viewer> myViewer;
NCollection_Haft<Handle_V3d_View> myView;
NCollection_Haft<Handle_AIS_InteractiveContext> myAISContext;
NCollection_Haft<Handle_Graphic3d_GraphicDriver> myGraphicDriver;
NCollection_Haft<Handle_OpenGl_GraphicDriver> myGraphicDriver;
};