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

0026915: Visualization - return Handle from Graphic3d_CView::FBOCreate() instead of a pointer

Browse Source 
OpenGl_View::FBO() - use copy Handle constructor for compatibility.
This commit is contained in:
kgv
2015-11-23 14:16:08 +03:00
committed by bugmaster
parent 6bd94e0de9
commit b128c89231
14 changed files with 85 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Graphic3d/FILES
View File

@@ -95,7 +95,6 @@ Graphic3d_NameOfTexturePlane.hxx
Graphic3d_NListOfHAsciiString.hxx
Graphic3d_NMapOfTransient.hxx
Graphic3d_PriorityDefinitionError.hxx
Graphic3d_PtrFrameBuffer.hxx
Graphic3d_RenderingMode.hxx
Graphic3d_RenderingParams.hxx
Graphic3d_SequenceOfGroup.hxx

15
src/Graphic3d/Graphic3d_CView.hxx
View File

@@ -30,7 +30,6 @@
#include <Graphic3d_GraduatedTrihedron.hxx>
#include <Graphic3d_MapOfStructure.hxx>
#include <Graphic3d_NMapOfTransient.hxx>
#include <Graphic3d_PtrFrameBuffer.hxx>
#include <Graphic3d_RenderingParams.hxx>
#include <Graphic3d_SequenceOfHClipPlane.hxx>
#include <Graphic3d_SequenceOfStructure.hxx>
@@ -349,28 +348,28 @@ public:
const Graphic3d_ZLayerSettings& theSettings) = 0;
//! Returns pointer to an assigned framebuffer object.
virtual Graphic3d_PtrFrameBuffer FBO() const = 0;
virtual Handle(Standard_Transient) FBO() const = 0;
//! Sets framebuffer object for offscreen rendering.
virtual void SetFBO (const Graphic3d_PtrFrameBuffer theFBO) = 0;
virtual void SetFBO (const Handle(Standard_Transient)& theFbo) = 0;
//! Generate offscreen FBO in the graphic library.
//! If not supported on hardware returns NULL.
virtual Graphic3d_PtrFrameBuffer FBOCreate (const Standard_Integer theWidth,
const Standard_Integer theHeight) = 0;
virtual Handle(Standard_Transient) FBOCreate (const Standard_Integer theWidth,
const Standard_Integer theHeight) = 0;
//! Remove offscreen FBO from the graphic library
virtual void FBORelease (Graphic3d_PtrFrameBuffer& theFBOPtr) = 0;
virtual void FBORelease (Handle(Standard_Transient)& theFbo) = 0;
//! Read offscreen FBO configuration.
virtual void FBOGetDimensions (const Graphic3d_PtrFrameBuffer theFBOPtr,
virtual void FBOGetDimensions (const Handle(Standard_Transient)& theFbo,
Standard_Integer& theWidth,
Standard_Integer& theHeight,
Standard_Integer& theWidthMax,
Standard_Integer& theHeightMax) = 0;
//! Change offscreen FBO viewport.
virtual void FBOChangeViewport (Graphic3d_PtrFrameBuffer& theFBOPtr,
virtual void FBOChangeViewport (const Handle(Standard_Transient)& theFbo,
const Standard_Integer theWidth,
const Standard_Integer theHeight) = 0;

1
src/Graphic3d/Graphic3d_GraphicDriver.hxx
View File

@@ -38,7 +38,6 @@
#include <Graphic3d_Vec3.hxx>
#include <Standard_ShortReal.hxx>
#include <Standard_Address.hxx>
#include <Graphic3d_PtrFrameBuffer.hxx>
#include <Image_PixMap.hxx>
#include <Graphic3d_BufferType.hxx>
#include <Aspect_Handle.hxx>

20
src/Graphic3d/Graphic3d_PtrFrameBuffer.hxx
View File

@@ -1,20 +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.
#ifndef _Graphic3d_PtrFrameBuffer_HeaderFile
#define _Graphic3d_PtrFrameBuffer_HeaderFile
class Graphic3d_FrameBuffer;
typedef Graphic3d_FrameBuffer* Graphic3d_PtrFrameBuffer;
#endif /*Graphic3d_PtrFrameBuffer_HeaderFile*/