-// File: OpenGl_Marker.cxx
-// Created: 13 July 2011
-// Author: Sergey ZERCHANINOV
-// Copyright: OPEN CASCADE 2011
+// Created on: 2011-07-13
+// Created by: Sergey ZERCHANINOV
+// Copyright (c) 2011-2012 OPEN CASCADE SAS
+//
+// The content of this file is subject to the Open CASCADE Technology Public
+// License Version 6.5 (the "License"). You may not use the content of this file
+// except in compliance with the License. Please obtain a copy of the License
+// at http://www.opencascade.org and read it completely before using this file.
+//
+// The Initial Developer of the Original Code is Open CASCADE S.A.S., having its
+// main offices at: 1, place des Freres Montgolfier, 78280 Guyancourt, France.
+//
+// The Original Code and all software distributed under the License is
+// distributed on an "AS IS" basis, without warranty of any kind, and the
+// Initial Developer hereby disclaims all such warranties, including without
+// limitation, any warranties of merchantability, fitness for a particular
+// purpose or non-infringement. Please see the License for the specific terms
+// and conditions governing the rights and limitations under the License.
+
#include <OpenGl_GlCore11.hxx>
+#include <OpenGl_Context.hxx>
#include <OpenGl_Marker.hxx>
#include <OpenGl_AspectMarker.hxx>
#include <OpenGl_Structure.hxx>
#include <OpenGl_Display.hxx>
+#include <OpenGl_Workspace.hxx>
/*----------------------------------------------------------------------*/
+void OpenGl_Marker::Release (const Handle(OpenGl_Context)& theContext)
+{
+ //
+}
+
void OpenGl_Marker::Render (const Handle(OpenGl_Workspace) &AWorkspace) const
{
const OpenGl_AspectMarker *aspect_marker = AWorkspace->AspectMarker( Standard_True );
}
case Aspect_TOM_POINT :
{
- glPointSize( aspect_marker->Scale() );
glBegin( GL_POINTS );
glVertex3fv( myPoint.xyz );
glEnd();
break;
}
case Aspect_TOM_USERDEFINED :
- {
+ {
glCallList( openglDisplay->GetUserMarkerListIndex( (int)aspect_marker->Scale() ) );
break;
}
glCallLists( strlen( str ), GL_UNSIGNED_BYTE, (const GLubyte *)str );
}
}
- GLint mode;
- glGetIntegerv( GL_RENDER_MODE, &mode );
- if( mode==GL_FEEDBACK )
+
+ if (AWorkspace->GetGlContext()->IsFeedback())
{
glBegin( GL_POINTS );
glVertex3fv( myPoint.xyz );