mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-04-05 18:16:23 +03:00
faff37677c
Graphic3d_TextureRoot::GetCompressedImage() - added new interface for fetching compressed texture image. Default implementation detects DDS image files using Image_DDSParser parser. Graphic3d_TextureRoot::GetImage() has been extended with new parameter - the list of image formats supported by OpenGL driver. Graphic3d_TextureRoot::convertToCompatible() implicitly converts BGRA image to RGBA on OpenGL ES, which normally does not support BGR formats. OpenGl_Caps::isTopDownTextureUV - new property defines how application defines UV texture coordinates in primitive arrays. OpenGl_Context::SetTextureMatrix() compares this flag with OpenGl_Texture::IsTopDown() and automatically flips V coordinate in case of mismatch. OpenGl_Texture now holds exact number of mipmap levels instead of Boolean flag indicating that they are defined. This allows loading DDS files with incomplete mipmap level set by setting GL_TEXTURE_MAX_LEVEL to appropriate value instead of default 1000 (causing black textures in case if mipmap levels are not defined till 1x1). Fixed order of texture coordinates transformation within GLSL program to match FFP matrix: Rotate -> Translate -> Scale (previously Rotation was applied afterwards).
50 lines
1.9 KiB
C++
Executable File
50 lines
1.9 KiB
C++
Executable File
#include "stdafx.h"
|
|
|
|
#include "Sample2D_Image.h"
|
|
|
|
#include <Graphic3d_Texture2Dmanual.hxx>
|
|
#include <Image_AlienPixMap.hxx>
|
|
|
|
IMPLEMENT_STANDARD_RTTIEXT(Sample2D_Image,AIS_Shape)
|
|
|
|
Sample2D_Image::Sample2D_Image(TCollection_AsciiString& aFileName,
|
|
const Standard_Real X,
|
|
const Standard_Real Y,
|
|
const Standard_Real aScale)
|
|
:AIS_Shape(TopoDS_Shape())
|
|
{
|
|
myFilename = aFileName;
|
|
myX = X;
|
|
myY = Y;
|
|
myScale = aScale;
|
|
}
|
|
void Sample2D_Image::MakeShape()
|
|
{
|
|
Standard_Real coeff = 1.0;
|
|
Handle(Image_AlienPixMap) anImage = new Image_AlienPixMap();
|
|
if (anImage->Load (myFilename))
|
|
{
|
|
coeff = Standard_Real(anImage->Height()) / Standard_Real(anImage->Width()) * myScale;
|
|
}
|
|
|
|
TopoDS_Edge E1 = BRepBuilderAPI_MakeEdge(gp_Pnt(myX,myY,0.), gp_Pnt(100*myScale+myX,myY,0.));
|
|
TopoDS_Edge E2 = BRepBuilderAPI_MakeEdge(gp_Pnt(100*myScale+myX,myY,0.), gp_Pnt(100*myScale+myX,100*coeff+myY,0.));
|
|
TopoDS_Edge E3 = BRepBuilderAPI_MakeEdge(gp_Pnt(100*myScale+myX,100*coeff+myY,0.), gp_Pnt(myX,100*coeff+myY,0.));
|
|
TopoDS_Edge E4 = BRepBuilderAPI_MakeEdge(gp_Pnt(myX,100*coeff+myY,0.), gp_Pnt(myX,myY,0.));
|
|
TopoDS_Wire anImageBounds = BRepBuilderAPI_MakeWire(E1,E2,E3,E4);
|
|
myFace = BRepBuilderAPI_MakeFace(gp_Pln(gp_Pnt(0,0,0),gp_Dir(0,0,1)),anImageBounds);
|
|
}
|
|
|
|
void Sample2D_Image::SetContext(const Handle(AIS_InteractiveContext)& theContext)
|
|
{
|
|
if(theContext.IsNull() || theContext->CurrentViewer().IsNull()) return;
|
|
AIS_InteractiveObject::SetContext(theContext);
|
|
MakeShape();
|
|
this->Set(TopoDS_Shape(myFace));
|
|
myDrawer->SetShadingAspect (new Prs3d_ShadingAspect());
|
|
Handle(Graphic3d_Texture2Dmanual) aTexture = new Graphic3d_Texture2Dmanual (myFilename);
|
|
aTexture->DisableModulate();
|
|
myDrawer->ShadingAspect()->Aspect()->SetTextureMap (aTexture);
|
|
myDrawer->ShadingAspect()->Aspect()->SetTextureMapOn();
|
|
}
|