X-Git-Url: http://git.dev.opencascade.org/gitweb/?p=occt.git;a=blobdiff_plain;f=src%2FOpenGl%2FOpenGl_Texture.hxx;h=084128626d2d250e8ea9e42d434c4a193a3ecaeb;hb=67312b7991c945e66d4fa1d3a6f8e02dbabc9b5a;hpb=f4a7308f61af6cde23a6380eb8127695b75f4690 diff --git a/src/OpenGl/OpenGl_Texture.hxx b/src/OpenGl/OpenGl_Texture.hxx index a9520d370f..084128626d 100644 --- a/src/OpenGl/OpenGl_Texture.hxx +++ b/src/OpenGl/OpenGl_Texture.hxx @@ -245,11 +245,6 @@ public: return Init3D (theCtx, aFormat, Graphic3d_Vec3i (theSizeX, theSizeY, theSizeZ), thePixels); } -protected: - - //! Apply default sampler parameters after texture creation. - Standard_EXPORT void applyDefaultSamplerParams (const Handle(OpenGl_Context)& theCtx); - //! Initializes 6 sides of cubemap. //! If theCubeMap is not NULL then size and format will be taken from it and corresponding arguments will be ignored. //! Otherwise this parametres will be taken from arguments. @@ -259,13 +254,18 @@ protected: //! @param theFormat [in] image format //! @param theToGenMipmap [in] flag to generate mipmaped cubemap //! @param theIsColorMap [in] flag indicating cubemap storing color values - Standard_EXPORT bool initCubeMap (const Handle(OpenGl_Context)& theCtx, + Standard_EXPORT bool InitCubeMap (const Handle(OpenGl_Context)& theCtx, const Handle(Graphic3d_CubeMap)& theCubeMap, Standard_Size theSize, Image_Format theFormat, Standard_Boolean theToGenMipmap, Standard_Boolean theIsColorMap); +protected: + + //! Apply default sampler parameters after texture creation. + Standard_EXPORT void applyDefaultSamplerParams (const Handle(OpenGl_Context)& theCtx); + protected: Handle(OpenGl_Sampler) mySampler; //!< texture sampler