0030748: Visualization - Marker displayed in immediate layer ruins QT Quick view...

[occt.git] / src / OpenGl / OpenGl_PointSprite.cxx

diff --git a/src/OpenGl/OpenGl_PointSprite.cxx b/src/OpenGl/OpenGl_PointSprite.cxx
index df734d3..acbe7d1 100755 (executable)
--- a/src/OpenGl/OpenGl_PointSprite.cxx
+++ b/src/OpenGl/OpenGl_PointSprite.cxx
@@ -16,23 +16,25 @@
 
 #include <Graphic3d_TextureParams.hxx>
 #include <OpenGl_Context.hxx>
+#include <OpenGl_Sampler.hxx>
 #include <Standard_Assert.hxx>
 #include <Image_PixMap.hxx>
 
+IMPLEMENT_STANDARD_RTTIEXT(OpenGl_PointSprite,OpenGl_Texture)
 
 // =======================================================================
 // function : OpenGl_PointSprite
 // purpose  :
 // =======================================================================
-OpenGl_PointSprite::OpenGl_PointSprite()
-: OpenGl_Texture (NULL),
+OpenGl_PointSprite::OpenGl_PointSprite (const TCollection_AsciiString& theResourceId)
+: OpenGl_Texture (theResourceId, Handle(Graphic3d_TextureParams)()),
   myBitmapList (0)
 {
-  //myParams->SetFilter (Graphic3d_TOTF_NEAREST);
-  myParams->SetModulate (Standard_False);
-  myParams->SetGenMode (Graphic3d_TOTM_SPRITE,
-                        Graphic3d_Vec4 (0.0f, 0.0f, 0.0f, 0.0f),
-                        Graphic3d_Vec4 (0.0f, 0.0f, 0.0f, 0.0f));
+  //mySampler->Parameters()->SetFilter (Graphic3d_TOTF_NEAREST);
+  mySampler->Parameters()->SetModulate (Standard_False);
+  mySampler->Parameters()->SetGenMode (Graphic3d_TOTM_SPRITE,
+                                       Graphic3d_Vec4 (0.0f, 0.0f, 0.0f, 0.0f),
+                                       Graphic3d_Vec4 (0.0f, 0.0f, 0.0f, 0.0f));
 }
 
 // =======================================================================
@@ -78,7 +80,6 @@ void OpenGl_PointSprite::SetDisplayList (const Handle(OpenGl_Context)& theCtx,
   myBitmapList = theBitmapList;
 }
 
-
 // =======================================================================
 // function : DrawBitmap
 // purpose  :