OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-10 18:51:21 +03:00
Code

0023397: Marker aspect doesn't applied to points drawn by Primitive Arrays

Browse Source 
Applying color and point size (marker type currently ignored).
This commit is contained in:
kgv 2012-08-22 11:36:50 +04:00 committed by bugmaster
parent 420399e331
commit 17f65eb229
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/OpenGl/OpenGl_Marker.cxx
View File

@ -52,7 +52,6 @@ void OpenGl_Marker::Render (const Handle(OpenGl_Workspace) &AWorkspace) const
} }
case Aspect_TOM_POINT : case Aspect_TOM_POINT :
{ {
glPointSize( aspect_marker->Scale() );
glBegin( GL_POINTS ); glBegin( GL_POINTS );
glVertex3fv( myPoint.xyz ); glVertex3fv( myPoint.xyz );
glEnd(); glEnd();

1
src/OpenGl/OpenGl_MarkerSet.cxx
View File

@ -70,7 +70,6 @@ void OpenGl_MarkerSet::Render (const Handle(OpenGl_Workspace) &AWorkspace) const
} }
case Aspect_TOM_POINT : case Aspect_TOM_POINT :
{ {
glPointSize( aspect_marker->Scale() );
glBegin( GL_POINTS ); glBegin( GL_POINTS );
for( i = 0, ptr = myPoints; i < myNbPoints; i++, ptr++ ) for( i = 0, ptr = myPoints; i < myNbPoints; i++, ptr++ )
glVertex3fv( ptr->xyz ); glVertex3fv( ptr->xyz );

7
src/OpenGl/OpenGl_PrimitiveArray.cxx
View File

@ -1615,13 +1615,14 @@ void OpenGl_PrimitiveArray::Render (const Handle(OpenGl_Workspace)& theWorkspace
break; break;
} }
const OpenGl_AspectFace* anAspectFace = theWorkspace->AspectFace (Standard_True); const OpenGl_AspectFace* anAspectFace = theWorkspace->AspectFace (Standard_True);
const OpenGl_AspectLine* anAspectLine = theWorkspace->AspectLine (Standard_True); const OpenGl_AspectLine* anAspectLine = theWorkspace->AspectLine (Standard_True);
const OpenGl_AspectMarker* anAspectMarker = theWorkspace->AspectMarker (myPArray->type == TelPointsArrayType);
Tint aFrontLightingModel = anAspectFace->Context().IntFront.color_mask; Tint aFrontLightingModel = anAspectFace->Context().IntFront.color_mask;
const TEL_COLOUR* anInteriorColor = &anAspectFace->Context().IntFront.matcol; const TEL_COLOUR* anInteriorColor = &anAspectFace->Context().IntFront.matcol;
const TEL_COLOUR* anEdgeColor = &anAspectFace->AspectEdge()->Color(); const TEL_COLOUR* anEdgeColor = &anAspectFace->AspectEdge()->Color();
const TEL_COLOUR* aLineColor = &anAspectLine->Color(); const TEL_COLOUR* aLineColor = (myPArray->type == TelPointsArrayType) ? &anAspectMarker->Color() : &anAspectLine->Color();
// Use highlight colors // Use highlight colors
if (theWorkspace->NamedStatus & OPENGL_NS_HIGHLIGHT) if (theWorkspace->NamedStatus & OPENGL_NS_HIGHLIGHT)

11
src/OpenGl/OpenGl_Workspace_5.cxx
View File

@ -598,10 +598,17 @@ const OpenGl_AspectFace * OpenGl_Workspace::AspectFace(const Standard_Boolean Wi
/*----------------------------------------------------------------------*/ /*----------------------------------------------------------------------*/
const OpenGl_AspectMarker * OpenGl_Workspace::AspectMarker(const Standard_Boolean WithApply) const OpenGl_AspectMarker* OpenGl_Workspace::AspectMarker (const Standard_Boolean theToApply)
{ {
if ( WithApply && (AspectMarker_set != AspectMarker_applied) ) if (theToApply && (AspectMarker_set != AspectMarker_applied))
{ {
if (!AspectMarker_applied || (AspectMarker_set->Scale() != AspectMarker_applied->Scale()))
{
glPointSize (AspectMarker_set->Scale());
#ifdef HAVE_GL2PS
gl2psPointSize (AspectMarker_set->Scale());
#endif
}
AspectMarker_applied = AspectMarker_set; AspectMarker_applied = AspectMarker_set;
} }
return AspectMarker_set; return AspectMarker_set;