Adding svn:eol-style=LF property
[occt.git] / samples / qt / Graphic3dDemo / src / Sphere_Sphere.cxx
index 7f73766..9a5cd6a 100755 (executable)
 #include <gp_Pnt2d.hxx>
 #include <gp_Vec.hxx>
 #endif
-\r
-#include <Graphic3d_AspectText3d.hxx>\r
-\r
-Standard_CString stText="Test";\r
-Standard_Integer stTextHeight=10;\r
+
+#include <Graphic3d_AspectText3d.hxx>
+
+Standard_CString stText="Test";
+Standard_Integer stTextHeight=10;
 
 static void ShadeWithVertex(const Handle(Graphic3d_Group) aGroup,
                            const gp_Pnt aPosition, 
                            const Standard_Real aRadius,
-                           const Standard_Real aDeflection,\r
-                               const Standard_Boolean isText,\r
+                           const Standard_Real aDeflection,
+                               const Standard_Boolean isText,
                                const Standard_Boolean isOptText) 
 {
       Standard_Real R1,R2;
@@ -58,12 +58,12 @@ static void ShadeWithVertex(const Handle(Graphic3d_Group) aGroup,
       Standard_Real Dalpha = 2.*Standard_PI/nbpanes;
       Standard_Integer i,j;
 
-      aPosition.Coord (Xc, Yc, Zc);\r
-         if(isText) {\r
-               Handle(Graphic3d_AspectText3d) Text3d = new Graphic3d_AspectText3d();\r
-               Text3d->SetTextureMappedFont(isOptText);\r
-               aGroup->SetPrimitivesAspect(Text3d);\r
-         }\r
+      aPosition.Coord (Xc, Yc, Zc);
+         if(isText) {
+               Handle(Graphic3d_AspectText3d) Text3d = new Graphic3d_AspectText3d();
+               Text3d->SetTextureMappedFont(isOptText);
+               aGroup->SetPrimitivesAspect(Text3d);
+         }
 
 #ifdef G005
       if( Graphic3d_ArrayOfPrimitives::IsEnable() ) {
@@ -72,8 +72,8 @@ static void ShadeWithVertex(const Handle(Graphic3d_Group) aGroup,
                 Standard_False,Standard_False,Standard_False,Standard_False);
         Handle(Graphic3d_ArrayOfQuadrangles) pquad =
                 new Graphic3d_ArrayOfQuadrangles(4*nbpanes*(nbpanes/2-2),0,
-                Standard_False,Standard_False,Standard_False,Standard_False);\r
-        aGroup->BeginPrimitives();\r
+                Standard_False,Standard_False,Standard_False,Standard_False);
+        aGroup->BeginPrimitives();
         for( j=0; j<nbpanes/2; j++ ) {
           Alpha = 0.;
           R1 = aRadius*sin(Beta);
@@ -92,27 +92,27 @@ static void ShadeWithVertex(const Handle(Graphic3d_Group) aGroup,
             X4 = R1*cos(Alpha);
             Y4 = R1*sin(Alpha);
             if( j == 0 ) {
-              ptri->AddVertex(X1+Xc,Y1+Yc,Z1+Zc);\r
-                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X1+Xc,Y1+Yc,Z1+Zc), stTextHeight);\r
-              ptri->AddVertex(X2+Xc,Y2+Yc,Z2+Zc);\r
+              ptri->AddVertex(X1+Xc,Y1+Yc,Z1+Zc);
+                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X1+Xc,Y1+Yc,Z1+Zc), stTextHeight);
+              ptri->AddVertex(X2+Xc,Y2+Yc,Z2+Zc);
                          if(isText) aGroup->Text(stText,Graphic3d_Vertex(X2+Xc,Y2+Yc,Z2+Zc), stTextHeight);
-              ptri->AddVertex(X3+Xc,Y3+Yc,Z3+Zc);\r
+              ptri->AddVertex(X3+Xc,Y3+Yc,Z3+Zc);
                          if(isText) aGroup->Text(stText,Graphic3d_Vertex(X3+Xc,Y3+Yc,Z3+Zc), stTextHeight);
             } else if( j == nbpanes/2-1 ) {
-              ptri->AddVertex(X1+Xc,Y1+Yc,Z1+Zc);\r
+              ptri->AddVertex(X1+Xc,Y1+Yc,Z1+Zc);
                          if(isText) aGroup->Text(stText,Graphic3d_Vertex(X1+Xc,Y1+Yc,Z1+Zc), stTextHeight);
-              ptri->AddVertex(X2+Xc,Y2+Yc,Z2+Zc);\r
+              ptri->AddVertex(X2+Xc,Y2+Yc,Z2+Zc);
                          if(isText) aGroup->Text(stText,Graphic3d_Vertex(X2+Xc,Y2+Yc,Z2+Zc), stTextHeight);
-              ptri->AddVertex(X4+Xc,Y4+Yc,Z4+Zc);\r
+              ptri->AddVertex(X4+Xc,Y4+Yc,Z4+Zc);
                          if(isText) aGroup->Text(stText,Graphic3d_Vertex(X4+Xc,Y4+Yc,Z4+Zc), stTextHeight);
             } else {
-              pquad->AddVertex(X1+Xc,Y1+Yc,Z1+Zc);\r
+              pquad->AddVertex(X1+Xc,Y1+Yc,Z1+Zc);
                          if(isText) aGroup->Text(stText,Graphic3d_Vertex(X1+Xc,Y1+Yc,Z1+Zc), stTextHeight);
-              pquad->AddVertex(X2+Xc,Y2+Yc,Z2+Zc);\r
+              pquad->AddVertex(X2+Xc,Y2+Yc,Z2+Zc);
                          if(isText) aGroup->Text(stText,Graphic3d_Vertex(X2+Xc,Y2+Yc,Z2+Zc), stTextHeight);
-              pquad->AddVertex(X3+Xc,Y3+Yc,Z3+Zc);\r
+              pquad->AddVertex(X3+Xc,Y3+Yc,Z3+Zc);
                          if(isText) aGroup->Text(stText,Graphic3d_Vertex(X3+Xc,Y3+Yc,Z3+Zc), stTextHeight);
-              pquad->AddVertex(X4+Xc,Y4+Yc,Z4+Zc);\r
+              pquad->AddVertex(X4+Xc,Y4+Yc,Z4+Zc);
                          if(isText) aGroup->Text(stText,Graphic3d_Vertex(X4+Xc,Y4+Yc,Z4+Zc), stTextHeight);
             }
           }
@@ -124,7 +124,7 @@ static void ShadeWithVertex(const Handle(Graphic3d_Group) aGroup,
       } else
 #endif
       {
-        aGroup->BeginPrimitives();\r
+        aGroup->BeginPrimitives();
         Graphic3d_Array1OfVertex TriVertex(1,3*nbpanes*2);
         Graphic3d_Array1OfVertex QuadVertex(1,4*nbpanes*(nbpanes/2-2));
         Aspect_Array1OfEdge TriEdge(1,3*nbpanes*2);
@@ -149,45 +149,45 @@ static void ShadeWithVertex(const Handle(Graphic3d_Group) aGroup,
             Y4 = R1*sin(Alpha);
             if( j == 0 ) {
               nt++;
-              TriVertex(nt).SetCoord(X1+Xc,Y1+Yc,Z1+Zc);\r
+              TriVertex(nt).SetCoord(X1+Xc,Y1+Yc,Z1+Zc);
                          if(isText) aGroup->Text(stText,Graphic3d_Vertex(X1+Xc,Y1+Yc,Z1+Zc), stTextHeight);
               TriEdge(nt).SetValues(nt,nt+1,Aspect_TOE_VISIBLE);
               nt++;
-              TriVertex(nt).SetCoord(X2+Xc,Y2+Yc,Z2+Zc);\r
+              TriVertex(nt).SetCoord(X2+Xc,Y2+Yc,Z2+Zc);
                          if(isText) aGroup->Text(stText,Graphic3d_Vertex(X2+Xc,Y2+Yc,Z2+Zc), stTextHeight);
               TriEdge(nt).SetValues(nt,nt+1,Aspect_TOE_VISIBLE);
               nt++;
-              TriVertex(nt).SetCoord(X3+Xc,Y3+Yc,Z3+Zc);\r
+              TriVertex(nt).SetCoord(X3+Xc,Y3+Yc,Z3+Zc);
                          if(isText) aGroup->Text(stText,Graphic3d_Vertex(X3+Xc,Y3+Yc,Z3+Zc), stTextHeight);
               TriEdge(nt).SetValues(nt,nt-2,Aspect_TOE_VISIBLE);
             } else if( j == nbpanes/2-1 ) {
               nt++;
-              TriVertex(nt).SetCoord(X1+Xc,Y1+Yc,Z1+Zc);\r
+              TriVertex(nt).SetCoord(X1+Xc,Y1+Yc,Z1+Zc);
                          if(isText) aGroup->Text(stText,Graphic3d_Vertex(X1+Xc,Y1+Yc,Z1+Zc), stTextHeight);
               TriEdge(nt).SetValues(nt,nt+1,Aspect_TOE_VISIBLE);
               nt++;
-              TriVertex(nt).SetCoord(X2+Xc,Y2+Yc,Z2+Zc);\r
+              TriVertex(nt).SetCoord(X2+Xc,Y2+Yc,Z2+Zc);
                          if(isText) aGroup->Text(stText,Graphic3d_Vertex(X2+Xc,Y2+Yc,Z2+Zc), stTextHeight);
               TriEdge(nt).SetValues(nt,nt+1,Aspect_TOE_VISIBLE);
               nt++;
-              TriVertex(nt).SetCoord(X4+Xc,Y4+Yc,Z4+Zc);\r
+              TriVertex(nt).SetCoord(X4+Xc,Y4+Yc,Z4+Zc);
                          if(isText) aGroup->Text(stText,Graphic3d_Vertex(X4+Xc,Y4+Yc,Z4+Zc), stTextHeight);
               TriEdge(nt).SetValues(nt,nt-2,Aspect_TOE_VISIBLE);
             } else {
               nq++;
-              QuadVertex(nq).SetCoord(X1+Xc,Y1+Yc,Z1+Zc);\r
+              QuadVertex(nq).SetCoord(X1+Xc,Y1+Yc,Z1+Zc);
                          if(isText) aGroup->Text(stText,Graphic3d_Vertex(X1+Xc,Y1+Yc,Z1+Zc), stTextHeight);
               QuadEdge(nq).SetValues(nq,nq+1,Aspect_TOE_VISIBLE);
               nq++;
-              QuadVertex(nq).SetCoord(X2+Xc,Y2+Yc,Z2+Zc);\r
+              QuadVertex(nq).SetCoord(X2+Xc,Y2+Yc,Z2+Zc);
                          if(isText) aGroup->Text(stText,Graphic3d_Vertex(X2+Xc,Y2+Yc,Z2+Zc), stTextHeight);
               QuadEdge(nq).SetValues(nq,nq+1,Aspect_TOE_VISIBLE);
               nq++;
-              QuadVertex(nq).SetCoord(X3+Xc,Y3+Yc,Z3+Zc);\r
+              QuadVertex(nq).SetCoord(X3+Xc,Y3+Yc,Z3+Zc);
                          if(isText) aGroup->Text(stText,Graphic3d_Vertex(X3+Xc,Y3+Yc,Z3+Zc), stTextHeight);
               QuadEdge(nq).SetValues(nq,nq+1,Aspect_TOE_VISIBLE);
               nq++;
-              QuadVertex(nq).SetCoord(X4+Xc,Y4+Yc,Z4+Zc);\r
+              QuadVertex(nq).SetCoord(X4+Xc,Y4+Yc,Z4+Zc);
                          if(isText) aGroup->Text(stText,Graphic3d_Vertex(X4+Xc,Y4+Yc,Z4+Zc), stTextHeight);
               QuadEdge(nq).SetValues(nq,nq-3,Aspect_TOE_VISIBLE);
             }
@@ -203,8 +203,8 @@ static void ShadeWithVertex(const Handle(Graphic3d_Group) aGroup,
 static void ShadeWithVertexN(const Handle(Graphic3d_Group) aGroup,
                            const gp_Pnt aPosition, 
                            const Standard_Real aRadius,
-                           const Standard_Real aDeflection,\r
-                               const Standard_Boolean isText,\r
+                           const Standard_Real aDeflection,
+                               const Standard_Boolean isText,
                                const Standard_Boolean isOptText) 
 {
       Standard_Real R1,R2;
@@ -220,12 +220,12 @@ static void ShadeWithVertexN(const Handle(Graphic3d_Group) aGroup,
       Standard_Real Dalpha = 2.*Standard_PI/nbpanes;
       Standard_Integer i,j;
 
-      aPosition.Coord (Xc, Yc, Zc);\r
-         if(isText) {\r
-               Handle(Graphic3d_AspectText3d) Text3d = new Graphic3d_AspectText3d();\r
-               Text3d->SetTextureMappedFont(isOptText);\r
-               aGroup->SetPrimitivesAspect(Text3d);\r
-         }\r
+      aPosition.Coord (Xc, Yc, Zc);
+         if(isText) {
+               Handle(Graphic3d_AspectText3d) Text3d = new Graphic3d_AspectText3d();
+               Text3d->SetTextureMappedFont(isOptText);
+               aGroup->SetPrimitivesAspect(Text3d);
+         }
 #ifdef G005
       if( Graphic3d_ArrayOfPrimitives::IsEnable() ) {
         Handle(Graphic3d_ArrayOfTriangles) ptri =
@@ -233,8 +233,8 @@ static void ShadeWithVertexN(const Handle(Graphic3d_Group) aGroup,
                 Standard_True,Standard_False,Standard_False,Standard_False);
         Handle(Graphic3d_ArrayOfQuadrangles) pquad =
                 new Graphic3d_ArrayOfQuadrangles(4*nbpanes*(nbpanes/2-2),0,
-                Standard_True,Standard_False,Standard_False,Standard_False);\r
-        aGroup->BeginPrimitives();\r
+                Standard_True,Standard_False,Standard_False,Standard_False);
+        aGroup->BeginPrimitives();
         for( j=0; j<nbpanes/2; j++ ) {
           Alpha = 0.;
           R1 = aRadius*sin(Beta);
@@ -253,38 +253,38 @@ static void ShadeWithVertexN(const Handle(Graphic3d_Group) aGroup,
             X4 = R1*cos(Alpha);
             Y4 = R1*sin(Alpha);
             if( j == 0 ) {
-                               ptri->AddVertex(gp_Pnt(X1+Xc,Y1+Yc,Z1+Zc),\r
+                               ptri->AddVertex(gp_Pnt(X1+Xc,Y1+Yc,Z1+Zc),
                                gp_Vec(X1/aRadius,Y1/aRadius,Z1/aRadius));
-                               if(isText) aGroup->Text(stText,Graphic3d_Vertex(X1+Xc,Y1+Yc,Z1+Zc), stTextHeight);\r
+                               if(isText) aGroup->Text(stText,Graphic3d_Vertex(X1+Xc,Y1+Yc,Z1+Zc), stTextHeight);
                                ptri->AddVertex(gp_Pnt(X2+Xc,Y2+Yc,Z2+Zc),
                                gp_Vec(X2/aRadius,Y2/aRadius,Z2/aRadius));
-                               if(isText) aGroup->Text(stText,Graphic3d_Vertex(X2+Xc,Y2+Yc,Z2+Zc), stTextHeight);\r
+                               if(isText) aGroup->Text(stText,Graphic3d_Vertex(X2+Xc,Y2+Yc,Z2+Zc), stTextHeight);
                                ptri->AddVertex(gp_Pnt(X3+Xc,Y3+Yc,Z3+Zc),
                                gp_Vec(X3/aRadius,Y3/aRadius,Z3/aRadius));
-                               if(isText) aGroup->Text(stText,Graphic3d_Vertex(X3+Xc,Y3+Yc,Z3+Zc), stTextHeight);\r
+                               if(isText) aGroup->Text(stText,Graphic3d_Vertex(X3+Xc,Y3+Yc,Z3+Zc), stTextHeight);
             } else if( j == nbpanes/2-1 ) {
                                ptri->AddVertex(gp_Pnt(X1+Xc,Y1+Yc,Z1+Zc),
                                gp_Vec(X1/aRadius,Y1/aRadius,Z1/aRadius));
-                               if(isText) aGroup->Text(stText,Graphic3d_Vertex(X1+Xc,Y1+Yc,Z1+Zc), stTextHeight);\r
+                               if(isText) aGroup->Text(stText,Graphic3d_Vertex(X1+Xc,Y1+Yc,Z1+Zc), stTextHeight);
                                ptri->AddVertex(gp_Pnt(X2+Xc,Y2+Yc,Z2+Zc),
                                gp_Vec(X2/aRadius,Y2/aRadius,Z2/aRadius));
-                               if(isText) aGroup->Text(stText,Graphic3d_Vertex(X2+Xc,Y2+Yc,Z2+Zc), stTextHeight);\r
+                               if(isText) aGroup->Text(stText,Graphic3d_Vertex(X2+Xc,Y2+Yc,Z2+Zc), stTextHeight);
                                ptri->AddVertex(gp_Pnt(X4+Xc,Y4+Yc,Z4+Zc),
                                gp_Vec(X4/aRadius,Y4/aRadius,Z4/aRadius));
-                               if(isText) aGroup->Text(stText,Graphic3d_Vertex(X4+Xc,Y4+Yc,Z4+Zc), stTextHeight);\r
+                               if(isText) aGroup->Text(stText,Graphic3d_Vertex(X4+Xc,Y4+Yc,Z4+Zc), stTextHeight);
             } else {
                                pquad->AddVertex(gp_Pnt(X1+Xc,Y1+Yc,Z1+Zc),
                                gp_Vec(X1/aRadius,Y1/aRadius,Z1/aRadius));
-                               if(isText) aGroup->Text(stText,Graphic3d_Vertex(X1+Xc,Y1+Yc,Z1+Zc), stTextHeight);\r
+                               if(isText) aGroup->Text(stText,Graphic3d_Vertex(X1+Xc,Y1+Yc,Z1+Zc), stTextHeight);
                                pquad->AddVertex(gp_Pnt(X2+Xc,Y2+Yc,Z2+Zc),
                                gp_Vec(X2/aRadius,Y2/aRadius,Z2/aRadius));
-                               if(isText) aGroup->Text(stText,Graphic3d_Vertex(X2+Xc,Y2+Yc,Z2+Zc), stTextHeight);\r
+                               if(isText) aGroup->Text(stText,Graphic3d_Vertex(X2+Xc,Y2+Yc,Z2+Zc), stTextHeight);
                                pquad->AddVertex(gp_Pnt(X3+Xc,Y3+Yc,Z3+Zc),
                                gp_Vec(X3/aRadius,Y3/aRadius,Z3/aRadius));
-                               if(isText) aGroup->Text(stText,Graphic3d_Vertex(X3+Xc,Y3+Yc,Z3+Zc), stTextHeight);\r
+                               if(isText) aGroup->Text(stText,Graphic3d_Vertex(X3+Xc,Y3+Yc,Z3+Zc), stTextHeight);
                                pquad->AddVertex(gp_Pnt(X4+Xc,Y4+Yc,Z4+Zc),
                                gp_Vec(X4/aRadius,Y4/aRadius,Z4/aRadius));
-                               if(isText) aGroup->Text(stText,Graphic3d_Vertex(X4+Xc,Y4+Yc,Z4+Zc), stTextHeight);\r
+                               if(isText) aGroup->Text(stText,Graphic3d_Vertex(X4+Xc,Y4+Yc,Z4+Zc), stTextHeight);
             }
           }
         }
@@ -294,8 +294,8 @@ static void ShadeWithVertexN(const Handle(Graphic3d_Group) aGroup,
         aGroup->EndPrimitives();
       } else
 #endif
-      {\r
-        aGroup->BeginPrimitives();\r
+      {
+        aGroup->BeginPrimitives();
         Graphic3d_Array1OfVertexN TriVertex(1,3*nbpanes*2);
         Graphic3d_Array1OfVertexN QuadVertex(1,4*nbpanes*(nbpanes/2-2));
         Aspect_Array1OfEdge TriEdge(1,3*nbpanes*2);
@@ -321,54 +321,54 @@ static void ShadeWithVertexN(const Handle(Graphic3d_Group) aGroup,
             if( j == 0 ) {
                                nt++;
                                TriVertex(nt).SetCoord(X1+Xc,Y1+Yc,Z1+Zc);
-                               if(isText) aGroup->Text(stText,Graphic3d_Vertex(X1+Xc,Y1+Yc,Z1+Zc), stTextHeight);\r
+                               if(isText) aGroup->Text(stText,Graphic3d_Vertex(X1+Xc,Y1+Yc,Z1+Zc), stTextHeight);
                                TriVertex(nt).SetNormal(X1/aRadius,Y1/aRadius,Z1/aRadius);
                                TriEdge(nt).SetValues(nt,nt+1,Aspect_TOE_VISIBLE);
                                nt++;
                                TriVertex(nt).SetCoord(X2+Xc,Y2+Yc,Z2+Zc);
-                               if(isText) aGroup->Text(stText,Graphic3d_Vertex(X2+Xc,Y2+Yc,Z2+Zc), stTextHeight);\r
+                               if(isText) aGroup->Text(stText,Graphic3d_Vertex(X2+Xc,Y2+Yc,Z2+Zc), stTextHeight);
                                TriVertex(nt).SetNormal(X2/aRadius,Y2/aRadius,Z2/aRadius);
                                TriEdge(nt).SetValues(nt,nt+1,Aspect_TOE_VISIBLE);
                                nt++;
                                TriVertex(nt).SetCoord(X3+Xc,Y3+Yc,Z3+Zc);
-                               if(isText) aGroup->Text(stText,Graphic3d_Vertex(X3+Xc,Y3+Yc,Z3+Zc), stTextHeight);\r
+                               if(isText) aGroup->Text(stText,Graphic3d_Vertex(X3+Xc,Y3+Yc,Z3+Zc), stTextHeight);
                                TriVertex(nt).SetNormal(X3/aRadius,Y3/aRadius,Z3/aRadius);
                                TriEdge(nt).SetValues(nt,nt-2,Aspect_TOE_VISIBLE);
             } else if( j == nbpanes/2-1 ) {
                                nt++;
                                TriVertex(nt).SetCoord(X1+Xc,Y1+Yc,Z1+Zc);
-                               if(isText) aGroup->Text(stText,Graphic3d_Vertex(X1+Xc,Y1+Yc,Z1+Zc), stTextHeight);\r
+                               if(isText) aGroup->Text(stText,Graphic3d_Vertex(X1+Xc,Y1+Yc,Z1+Zc), stTextHeight);
                                TriVertex(nt).SetNormal(X1/aRadius,Y1/aRadius,Z1/aRadius);
                                TriEdge(nt).SetValues(nt,nt+1,Aspect_TOE_VISIBLE);
                                nt++;
                                TriVertex(nt).SetCoord(X2+Xc,Y2+Yc,Z2+Zc);
-                               if(isText) aGroup->Text(stText,Graphic3d_Vertex(X2+Xc,Y2+Yc,Z2+Zc), stTextHeight);\r
+                               if(isText) aGroup->Text(stText,Graphic3d_Vertex(X2+Xc,Y2+Yc,Z2+Zc), stTextHeight);
                                TriVertex(nt).SetNormal(X2/aRadius,Y2/aRadius,Z2/aRadius);
                                TriEdge(nt).SetValues(nt,nt+1,Aspect_TOE_VISIBLE);
                                nt++;
                                TriVertex(nt).SetCoord(X4+Xc,Y4+Yc,Z4+Zc);
-                               if(isText) aGroup->Text(stText,Graphic3d_Vertex(X4+Xc,Y4+Yc,Z4+Zc), stTextHeight);\r
+                               if(isText) aGroup->Text(stText,Graphic3d_Vertex(X4+Xc,Y4+Yc,Z4+Zc), stTextHeight);
                                TriVertex(nt).SetNormal(X4/aRadius,Y4/aRadius,Z4/aRadius);
                                TriEdge(nt).SetValues(nt,nt-2,Aspect_TOE_VISIBLE);
             } else {
                                nq++;
                                QuadVertex(nq).SetCoord(X1+Xc,Y1+Yc,Z1+Zc);
-                               if(isText) aGroup->Text(stText,Graphic3d_Vertex(X1+Xc,Y1+Yc,Z1+Zc), stTextHeight);\r
+                               if(isText) aGroup->Text(stText,Graphic3d_Vertex(X1+Xc,Y1+Yc,Z1+Zc), stTextHeight);
                                QuadVertex(nq).SetNormal(X1/aRadius,Y1/aRadius,Z1/aRadius);
                                QuadEdge(nq).SetValues(nq,nq+1,Aspect_TOE_VISIBLE);
                                nq++;
                                QuadVertex(nq).SetCoord(X2+Xc,Y2+Yc,Z2+Zc);
-                               if(isText) aGroup->Text(stText,Graphic3d_Vertex(X2+Xc,Y2+Yc,Z2+Zc), stTextHeight);\r
+                               if(isText) aGroup->Text(stText,Graphic3d_Vertex(X2+Xc,Y2+Yc,Z2+Zc), stTextHeight);
                                QuadVertex(nq).SetNormal(X2/aRadius,Y2/aRadius,Z2/aRadius);
                                QuadEdge(nq).SetValues(nq,nq+1,Aspect_TOE_VISIBLE);
                                nq++;
                                QuadVertex(nq).SetCoord(X3+Xc,Y3+Yc,Z3+Zc);
-                               if(isText) aGroup->Text(stText,Graphic3d_Vertex(X3+Xc,Y3+Yc,Z3+Zc), stTextHeight);\r
+                               if(isText) aGroup->Text(stText,Graphic3d_Vertex(X3+Xc,Y3+Yc,Z3+Zc), stTextHeight);
                                QuadVertex(nq).SetNormal(X3/aRadius,Y3/aRadius,Z3/aRadius);
                                QuadEdge(nq).SetValues(nq,nq+1,Aspect_TOE_VISIBLE);
                                nq++;
                                QuadVertex(nq).SetCoord(X4+Xc,Y4+Yc,Z4+Zc);
-                               if(isText) aGroup->Text(stText,Graphic3d_Vertex(X4+Xc,Y4+Yc,Z4+Zc), stTextHeight);\r
+                               if(isText) aGroup->Text(stText,Graphic3d_Vertex(X4+Xc,Y4+Yc,Z4+Zc), stTextHeight);
                                QuadVertex(nq).SetNormal(X4/aRadius,Y4/aRadius,Z4/aRadius);
                                QuadEdge(nq).SetValues(nq,nq-3,Aspect_TOE_VISIBLE);
             }
@@ -384,8 +384,8 @@ static void ShadeWithVertexN(const Handle(Graphic3d_Group) aGroup,
 static void ShadeWithVertexC(const Handle(Graphic3d_Group) aGroup,
                            const gp_Pnt aPosition, 
                            const Standard_Real aRadius,
-                           const Standard_Real aDeflection,\r
-                               const Standard_Boolean isText,\r
+                           const Standard_Real aDeflection,
+                               const Standard_Boolean isText,
                                const Standard_Boolean isOptText) 
 {
       Standard_Real R1,R2;
@@ -403,11 +403,11 @@ static void ShadeWithVertexC(const Handle(Graphic3d_Group) aGroup,
       Standard_Integer i,j;
 
       aPosition.Coord (Xc, Yc, Zc);
-         if(isText) {\r
-               Handle(Graphic3d_AspectText3d) Text3d = new Graphic3d_AspectText3d();\r
-               Text3d->SetTextureMappedFont(isOptText);\r
-               aGroup->SetPrimitivesAspect(Text3d);\r
-         }\r
+         if(isText) {
+               Handle(Graphic3d_AspectText3d) Text3d = new Graphic3d_AspectText3d();
+               Text3d->SetTextureMappedFont(isOptText);
+               aGroup->SetPrimitivesAspect(Text3d);
+         }
 #ifdef G005
       if( Graphic3d_ArrayOfPrimitives::IsEnable() ) {
         Handle(Graphic3d_ArrayOfTriangles) ptri =
@@ -416,7 +416,7 @@ static void ShadeWithVertexC(const Handle(Graphic3d_Group) aGroup,
         Handle(Graphic3d_ArrayOfQuadrangles) pquad =
                 new Graphic3d_ArrayOfQuadrangles(4*nbpanes*(nbpanes/2-2),0,
                 Standard_False,Standard_True,Standard_False,Standard_False);
-        aGroup->BeginPrimitives();\r
+        aGroup->BeginPrimitives();
         for( j=0; j<nbpanes/2; j++ ) {
           Alpha = 0.;
           R1 = aRadius*sin(Beta);
@@ -444,27 +444,27 @@ static void ShadeWithVertexC(const Handle(Graphic3d_Group) aGroup,
                0.5+Y4/aRadius/2.,0.5+Z4/aRadius/2.,Quantity_TOC_RGB);
             if( j == 0 ) {
               ptri->AddVertex(gp_Pnt(X1+Xc,Y1+Yc,Z1+Zc),C1);
-                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X1+Xc,Y1+Yc,Z1+Zc), stTextHeight);\r
+                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X1+Xc,Y1+Yc,Z1+Zc), stTextHeight);
               ptri->AddVertex(gp_Pnt(X2+Xc,Y2+Yc,Z2+Zc),C2);
-                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X2+Xc,Y2+Yc,Z2+Zc), stTextHeight);\r
+                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X2+Xc,Y2+Yc,Z2+Zc), stTextHeight);
               ptri->AddVertex(gp_Pnt(X3+Xc,Y3+Yc,Z3+Zc),C3);
-                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X3+Xc,Y3+Yc,Z3+Zc), stTextHeight);\r
+                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X3+Xc,Y3+Yc,Z3+Zc), stTextHeight);
             } else if( j == nbpanes/2-1 ) {
               ptri->AddVertex(gp_Pnt(X1+Xc,Y1+Yc,Z1+Zc),C1);
-                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X1+Xc,Y1+Yc,Z1+Zc), stTextHeight);\r
+                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X1+Xc,Y1+Yc,Z1+Zc), stTextHeight);
               ptri->AddVertex(gp_Pnt(X2+Xc,Y2+Yc,Z2+Zc),C2);
-                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X2+Xc,Y2+Yc,Z2+Zc), stTextHeight);\r
+                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X2+Xc,Y2+Yc,Z2+Zc), stTextHeight);
               ptri->AddVertex(gp_Pnt(X4+Xc,Y4+Yc,Z4+Zc),C4);
-                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X4+Xc,Y4+Yc,Z4+Zc), stTextHeight);\r
+                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X4+Xc,Y4+Yc,Z4+Zc), stTextHeight);
             } else {
               pquad->AddVertex(gp_Pnt(X1+Xc,Y1+Yc,Z1+Zc),C1);
-                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X1+Xc,Y1+Yc,Z1+Zc), stTextHeight);\r
+                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X1+Xc,Y1+Yc,Z1+Zc), stTextHeight);
               pquad->AddVertex(gp_Pnt(X2+Xc,Y2+Yc,Z2+Zc),C2);
-                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X2+Xc,Y2+Yc,Z2+Zc), stTextHeight);\r
+                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X2+Xc,Y2+Yc,Z2+Zc), stTextHeight);
               pquad->AddVertex(gp_Pnt(X3+Xc,Y3+Yc,Z3+Zc),C3);
-                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X3+Xc,Y3+Yc,Z3+Zc), stTextHeight);\r
+                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X3+Xc,Y3+Yc,Z3+Zc), stTextHeight);
               pquad->AddVertex(gp_Pnt(X4+Xc,Y4+Yc,Z4+Zc),C4);
-                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X4+Xc,Y4+Yc,Z4+Zc), stTextHeight);\r
+                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X4+Xc,Y4+Yc,Z4+Zc), stTextHeight);
             }
           }
         }
@@ -475,7 +475,7 @@ static void ShadeWithVertexC(const Handle(Graphic3d_Group) aGroup,
       } else
 #endif
       {
-        aGroup->BeginPrimitives();\r
+        aGroup->BeginPrimitives();
         Graphic3d_Array1OfVertexC TriVertex(1,3*nbpanes*2);
         Graphic3d_Array1OfVertexC QuadVertex(1,4*nbpanes*(nbpanes/2-2));
         Aspect_Array1OfEdge TriEdge(1,3*nbpanes*2);
@@ -509,54 +509,54 @@ static void ShadeWithVertexC(const Handle(Graphic3d_Group) aGroup,
             if( j == 0 ) {
               nt++;
               TriVertex(nt).SetCoord(X1+Xc,Y1+Yc,Z1+Zc);
-                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X1+Xc,Y1+Yc,Z1+Zc), stTextHeight);\r
+                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X1+Xc,Y1+Yc,Z1+Zc), stTextHeight);
              TriVertex(nt).SetColor(C1);
               TriEdge(nt).SetValues(nt,nt+1,Aspect_TOE_VISIBLE);
               nt++;
               TriVertex(nt).SetCoord(X2+Xc,Y2+Yc,Z2+Zc);
-                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X2+Xc,Y2+Yc,Z2+Zc), stTextHeight);\r
+                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X2+Xc,Y2+Yc,Z2+Zc), stTextHeight);
              TriVertex(nt).SetColor(C2);
               TriEdge(nt).SetValues(nt,nt+1,Aspect_TOE_VISIBLE);
               nt++;
               TriVertex(nt).SetCoord(X3+Xc,Y3+Yc,Z3+Zc);
-                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X3+Xc,Y3+Yc,Z3+Zc), stTextHeight);\r
+                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X3+Xc,Y3+Yc,Z3+Zc), stTextHeight);
              TriVertex(nt).SetColor(C3);
               TriEdge(nt).SetValues(nt,nt-2,Aspect_TOE_VISIBLE);
             } else if( j == nbpanes/2-1 ) {
               nt++;
               TriVertex(nt).SetCoord(X1+Xc,Y1+Yc,Z1+Zc);
-                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X1+Xc,Y1+Yc,Z1+Zc), stTextHeight);\r
+                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X1+Xc,Y1+Yc,Z1+Zc), stTextHeight);
              TriVertex(nt).SetColor(C1);
               TriEdge(nt).SetValues(nt,nt+1,Aspect_TOE_VISIBLE);
               nt++;
               TriVertex(nt).SetCoord(X2+Xc,Y2+Yc,Z2+Zc);
-                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X2+Xc,Y2+Yc,Z2+Zc), stTextHeight);\r
+                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X2+Xc,Y2+Yc,Z2+Zc), stTextHeight);
              TriVertex(nt).SetColor(C2);
               TriEdge(nt).SetValues(nt,nt+1,Aspect_TOE_VISIBLE);
               nt++;
               TriVertex(nt).SetCoord(X4+Xc,Y4+Yc,Z4+Zc);
-                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X4+Xc,Y4+Yc,Z4+Zc), stTextHeight);\r
+                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X4+Xc,Y4+Yc,Z4+Zc), stTextHeight);
              TriVertex(nt).SetColor(C4);
               TriEdge(nt).SetValues(nt,nt-2,Aspect_TOE_VISIBLE);
             } else {
               nq++;
               QuadVertex(nq).SetCoord(X1+Xc,Y1+Yc,Z1+Zc);
-                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X1+Xc,Y1+Yc,Z1+Zc), stTextHeight);\r
+                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X1+Xc,Y1+Yc,Z1+Zc), stTextHeight);
              QuadVertex(nq).SetColor(C1);
               QuadEdge(nq).SetValues(nq,nq+1,Aspect_TOE_VISIBLE);
               nq++;
               QuadVertex(nq).SetCoord(X2+Xc,Y2+Yc,Z2+Zc);
-                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X2+Xc,Y2+Yc,Z2+Zc), stTextHeight);\r
+                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X2+Xc,Y2+Yc,Z2+Zc), stTextHeight);
              QuadVertex(nq).SetColor(C2);
               QuadEdge(nq).SetValues(nq,nq+1,Aspect_TOE_VISIBLE);
               nq++;
               QuadVertex(nq).SetCoord(X3+Xc,Y3+Yc,Z3+Zc);
-                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X3+Xc,Y3+Yc,Z3+Zc), stTextHeight);\r
+                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X3+Xc,Y3+Yc,Z3+Zc), stTextHeight);
              QuadVertex(nq).SetColor(C3);
               QuadEdge(nq).SetValues(nq,nq+1,Aspect_TOE_VISIBLE);
               nq++;
               QuadVertex(nq).SetCoord(X4+Xc,Y4+Yc,Z4+Zc);
-                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X4+Xc,Y4+Yc,Z4+Zc), stTextHeight);\r
+                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X4+Xc,Y4+Yc,Z4+Zc), stTextHeight);
              QuadVertex(nq).SetColor(C4);
               QuadEdge(nq).SetValues(nq,nq-3,Aspect_TOE_VISIBLE);
             }
@@ -572,8 +572,8 @@ static void ShadeWithVertexC(const Handle(Graphic3d_Group) aGroup,
 static void ShadeWithVertexNC(const Handle(Graphic3d_Group) aGroup,
                            const gp_Pnt aPosition, 
                            const Standard_Real aRadius,
-                           const Standard_Real aDeflection,\r
-                               const Standard_Boolean isText,\r
+                           const Standard_Real aDeflection,
+                               const Standard_Boolean isText,
                                const Standard_Boolean isOptText) 
 {
       Standard_Real R1,R2;
@@ -591,11 +591,11 @@ static void ShadeWithVertexNC(const Handle(Graphic3d_Group) aGroup,
       Standard_Integer i,j;
 
       aPosition.Coord (Xc, Yc, Zc);
-         if(isText) {\r
-               Handle(Graphic3d_AspectText3d) Text3d = new Graphic3d_AspectText3d();\r
-               Text3d->SetTextureMappedFont(isOptText);\r
-               aGroup->SetPrimitivesAspect(Text3d);\r
-         }\r
+         if(isText) {
+               Handle(Graphic3d_AspectText3d) Text3d = new Graphic3d_AspectText3d();
+               Text3d->SetTextureMappedFont(isOptText);
+               aGroup->SetPrimitivesAspect(Text3d);
+         }
 #ifdef G005
       if( Graphic3d_ArrayOfPrimitives::IsEnable() ) {
         Handle(Graphic3d_ArrayOfTriangles) ptri =
@@ -604,7 +604,7 @@ static void ShadeWithVertexNC(const Handle(Graphic3d_Group) aGroup,
         Handle(Graphic3d_ArrayOfQuadrangles) pquad =
                 new Graphic3d_ArrayOfQuadrangles(4*nbpanes*(nbpanes/2-2),0,
                 Standard_True,Standard_True,Standard_False,Standard_False);
-        aGroup->BeginPrimitives();\r
+        aGroup->BeginPrimitives();
         for( j=0; j<nbpanes/2; j++ ) {
           Alpha = 0.;
           R1 = aRadius*sin(Beta);
@@ -633,36 +633,36 @@ static void ShadeWithVertexNC(const Handle(Graphic3d_Group) aGroup,
             if( j == 0 ) {
               ptri->AddVertex(gp_Pnt(X1+Xc,Y1+Yc,Z1+Zc),
                        gp_Vec(X1/aRadius,Y1/aRadius,Z1/aRadius),C1);
-                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X1+Xc,Y1+Yc,Z1+Zc), stTextHeight);\r
+                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X1+Xc,Y1+Yc,Z1+Zc), stTextHeight);
               ptri->AddVertex(gp_Pnt(X2+Xc,Y2+Yc,Z2+Zc),
                        gp_Vec(X2/aRadius,Y2/aRadius,Z2/aRadius),C2);
-                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X2+Xc,Y2+Yc,Z2+Zc), stTextHeight);\r
+                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X2+Xc,Y2+Yc,Z2+Zc), stTextHeight);
               ptri->AddVertex(gp_Pnt(X3+Xc,Y3+Yc,Z3+Zc),
                        gp_Vec(X3/aRadius,Y3/aRadius,Z3/aRadius),C3);
-                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X3+Xc,Y3+Yc,Z3+Zc), stTextHeight);\r
+                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X3+Xc,Y3+Yc,Z3+Zc), stTextHeight);
             } else if( j == nbpanes/2-1 ) {
               ptri->AddVertex(gp_Pnt(X1+Xc,Y1+Yc,Z1+Zc),
                        gp_Vec(X1/aRadius,Y1/aRadius,Z1/aRadius),C1);
-                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X1+Xc,Y1+Yc,Z1+Zc), stTextHeight);\r
+                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X1+Xc,Y1+Yc,Z1+Zc), stTextHeight);
               ptri->AddVertex(gp_Pnt(X2+Xc,Y2+Yc,Z2+Zc),
                        gp_Vec(X2/aRadius,Y2/aRadius,Z2/aRadius),C2);
-                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X2+Xc,Y2+Yc,Z2+Zc), stTextHeight);\r
+                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X2+Xc,Y2+Yc,Z2+Zc), stTextHeight);
               ptri->AddVertex(gp_Pnt(X4+Xc,Y4+Yc,Z4+Zc),
                        gp_Vec(X4/aRadius,Y4/aRadius,Z4/aRadius),C4);
-                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X4+Xc,Y4+Yc,Z4+Zc), stTextHeight);\r
+                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X4+Xc,Y4+Yc,Z4+Zc), stTextHeight);
             } else {
               pquad->AddVertex(gp_Pnt(X1+Xc,Y1+Yc,Z1+Zc),
                        gp_Vec(X1/aRadius,Y1/aRadius,Z1/aRadius),C1);
-                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X1+Xc,Y1+Yc,Z1+Zc), stTextHeight);\r
+                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X1+Xc,Y1+Yc,Z1+Zc), stTextHeight);
               pquad->AddVertex(gp_Pnt(X2+Xc,Y2+Yc,Z2+Zc),
                        gp_Vec(X2/aRadius,Y2/aRadius,Z2/aRadius),C2);
-                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X2+Xc,Y2+Yc,Z2+Zc), stTextHeight);\r
+                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X2+Xc,Y2+Yc,Z2+Zc), stTextHeight);
               pquad->AddVertex(gp_Pnt(X3+Xc,Y3+Yc,Z3+Zc),
                        gp_Vec(X3/aRadius,Y3/aRadius,Z3/aRadius),C3);
-                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X3+Xc,Y3+Yc,Z3+Zc), stTextHeight);\r
+                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X3+Xc,Y3+Yc,Z3+Zc), stTextHeight);
               pquad->AddVertex(gp_Pnt(X4+Xc,Y4+Yc,Z4+Zc),
                        gp_Vec(X4/aRadius,Y4/aRadius,Z4/aRadius),C4);
-                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X4+Xc,Y4+Yc,Z4+Zc), stTextHeight);\r
+                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X4+Xc,Y4+Yc,Z4+Zc), stTextHeight);
             }
           }
         }
@@ -673,7 +673,7 @@ static void ShadeWithVertexNC(const Handle(Graphic3d_Group) aGroup,
       } else
 #endif
       {
-        aGroup->BeginPrimitives();\r
+        aGroup->BeginPrimitives();
         Graphic3d_Array1OfVertexNC TriVertex(1,3*nbpanes*2);
         Graphic3d_Array1OfVertexNC QuadVertex(1,4*nbpanes*(nbpanes/2-2));
         Aspect_Array1OfEdge TriEdge(1,3*nbpanes*2);
@@ -707,63 +707,63 @@ static void ShadeWithVertexNC(const Handle(Graphic3d_Group) aGroup,
             if( j == 0 ) {
               nt++;
               TriVertex(nt).SetCoord(X1+Xc,Y1+Yc,Z1+Zc);
-                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X1+Xc,Y1+Yc,Z1+Zc), stTextHeight);\r
+                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X1+Xc,Y1+Yc,Z1+Zc), stTextHeight);
              TriVertex(nt).SetNormal(X1/aRadius,Y1/aRadius,Z1/aRadius);
              TriVertex(nt).SetColor(C1);
               TriEdge(nt).SetValues(nt,nt+1,Aspect_TOE_VISIBLE);
               nt++;
               TriVertex(nt).SetCoord(X2+Xc,Y2+Yc,Z2+Zc);
-                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X2+Xc,Y2+Yc,Z2+Zc), stTextHeight);\r
+                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X2+Xc,Y2+Yc,Z2+Zc), stTextHeight);
              TriVertex(nt).SetNormal(X2/aRadius,Y2/aRadius,Z2/aRadius);
              TriVertex(nt).SetColor(C2);
               TriEdge(nt).SetValues(nt,nt+1,Aspect_TOE_VISIBLE);
               nt++;
               TriVertex(nt).SetCoord(X3+Xc,Y3+Yc,Z3+Zc);
-                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X3+Xc,Y3+Yc,Z3+Zc), stTextHeight);\r
+                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X3+Xc,Y3+Yc,Z3+Zc), stTextHeight);
              TriVertex(nt).SetNormal(X3/aRadius,Y3/aRadius,Z3/aRadius);
              TriVertex(nt).SetColor(C3);
               TriEdge(nt).SetValues(nt,nt-2,Aspect_TOE_VISIBLE);
             } else if( j == nbpanes/2-1 ) {
               nt++;
               TriVertex(nt).SetCoord(X1+Xc,Y1+Yc,Z1+Zc);
-                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X1+Xc,Y1+Yc,Z1+Zc), stTextHeight);\r
+                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X1+Xc,Y1+Yc,Z1+Zc), stTextHeight);
              TriVertex(nt).SetNormal(X1/aRadius,Y1/aRadius,Z1/aRadius);
              TriVertex(nt).SetColor(C1);
               TriEdge(nt).SetValues(nt,nt+1,Aspect_TOE_VISIBLE);
               nt++;
               TriVertex(nt).SetCoord(X2+Xc,Y2+Yc,Z2+Zc);
-                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X2+Xc,Y2+Yc,Z2+Zc), stTextHeight);\r
+                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X2+Xc,Y2+Yc,Z2+Zc), stTextHeight);
              TriVertex(nt).SetNormal(X2/aRadius,Y2/aRadius,Z2/aRadius);
              TriVertex(nt).SetColor(C2);
               TriEdge(nt).SetValues(nt,nt+1,Aspect_TOE_VISIBLE);
               nt++;
               TriVertex(nt).SetCoord(X4+Xc,Y4+Yc,Z4+Zc);
-                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X4+Xc,Y4+Yc,Z4+Zc), stTextHeight);\r
+                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X4+Xc,Y4+Yc,Z4+Zc), stTextHeight);
              TriVertex(nt).SetNormal(X4/aRadius,Y4/aRadius,Z4/aRadius);
              TriVertex(nt).SetColor(C4);
               TriEdge(nt).SetValues(nt,nt-2,Aspect_TOE_VISIBLE);
             } else {
               nq++;
               QuadVertex(nq).SetCoord(X1+Xc,Y1+Yc,Z1+Zc);
-                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X1+Xc,Y1+Yc,Z1+Zc), stTextHeight);\r
+                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X1+Xc,Y1+Yc,Z1+Zc), stTextHeight);
              QuadVertex(nq).SetNormal(X1/aRadius,Y1/aRadius,Z1/aRadius);
              QuadVertex(nq).SetColor(C1);
               QuadEdge(nq).SetValues(nq,nq+1,Aspect_TOE_VISIBLE);
               nq++;
               QuadVertex(nq).SetCoord(X2+Xc,Y2+Yc,Z2+Zc);
-                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X2+Xc,Y2+Yc,Z2+Zc), stTextHeight);\r
+                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X2+Xc,Y2+Yc,Z2+Zc), stTextHeight);
              QuadVertex(nq).SetNormal(X2/aRadius,Y2/aRadius,Z2/aRadius);
              QuadVertex(nq).SetColor(C2);
               QuadEdge(nq).SetValues(nq,nq+1,Aspect_TOE_VISIBLE);
               nq++;
               QuadVertex(nq).SetCoord(X3+Xc,Y3+Yc,Z3+Zc);
-                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X3+Xc,Y3+Yc,Z3+Zc), stTextHeight);\r
+                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X3+Xc,Y3+Yc,Z3+Zc), stTextHeight);
              QuadVertex(nq).SetNormal(X3/aRadius,Y3/aRadius,Z3/aRadius);
              QuadVertex(nq).SetColor(C3);
               QuadEdge(nq).SetValues(nq,nq+1,Aspect_TOE_VISIBLE);
               nq++;
               QuadVertex(nq).SetCoord(X4+Xc,Y4+Yc,Z4+Zc);
-                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X4+Xc,Y4+Yc,Z4+Zc), stTextHeight);\r
+                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X4+Xc,Y4+Yc,Z4+Zc), stTextHeight);
              QuadVertex(nq).SetNormal(X4/aRadius,Y4/aRadius,Z4/aRadius);
              QuadVertex(nq).SetColor(C4);
               QuadEdge(nq).SetValues(nq,nq-3,Aspect_TOE_VISIBLE);
@@ -780,8 +780,8 @@ static void ShadeWithVertexNC(const Handle(Graphic3d_Group) aGroup,
 static void ShadeWithVertexNT(const Handle(Graphic3d_Group) aGroup,
                            const gp_Pnt aPosition, 
                            const Standard_Real aRadius,
-                           const Standard_Real aDeflection,\r
-                               const Standard_Boolean isText,\r
+                           const Standard_Real aDeflection,
+                               const Standard_Boolean isText,
                                const Standard_Boolean isOptText) 
 {
       Standard_Real R1,R2;
@@ -799,11 +799,11 @@ static void ShadeWithVertexNT(const Handle(Graphic3d_Group) aGroup,
       Standard_Integer i,j;
 
       aPosition.Coord (Xc, Yc, Zc);
-         if(isText) {\r
-               Handle(Graphic3d_AspectText3d) Text3d = new Graphic3d_AspectText3d();\r
-               Text3d->SetTextureMappedFont(isOptText);\r
-               aGroup->SetPrimitivesAspect(Text3d);\r
-         }\r
+         if(isText) {
+               Handle(Graphic3d_AspectText3d) Text3d = new Graphic3d_AspectText3d();
+               Text3d->SetTextureMappedFont(isOptText);
+               aGroup->SetPrimitivesAspect(Text3d);
+         }
 #ifdef G005
       if( Graphic3d_ArrayOfPrimitives::IsEnable() ) {
         Handle(Graphic3d_ArrayOfTriangles) ptri =
@@ -812,7 +812,7 @@ static void ShadeWithVertexNT(const Handle(Graphic3d_Group) aGroup,
         Handle(Graphic3d_ArrayOfQuadrangles) pquad =
                 new Graphic3d_ArrayOfQuadrangles(4*nbpanes*(nbpanes/2-2),0,
                 Standard_True,Standard_False,Standard_True,Standard_False);
-        aGroup->BeginPrimitives();\r
+        aGroup->BeginPrimitives();
         for( j=0; j<nbpanes/2; j++ ) {
           Alpha = 0.;
           R1 = aRadius*sin(Beta);
@@ -838,45 +838,45 @@ static void ShadeWithVertexNT(const Handle(Graphic3d_Group) aGroup,
               ptri->AddVertex(gp_Pnt(X1+Xc,Y1+Yc,Z1+Zc),
                        gp_Vec(X1/aRadius,Y1/aRadius,Z1/aRadius),
                        gp_Pnt2d(Tx1,Ty1));
-                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X1+Xc,Y1+Yc,Z1+Zc), stTextHeight);\r
+                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X1+Xc,Y1+Yc,Z1+Zc), stTextHeight);
               ptri->AddVertex(gp_Pnt(X2+Xc,Y2+Yc,Z2+Zc),
                        gp_Vec(X2/aRadius,Y2/aRadius,Z2/aRadius),
                        gp_Pnt2d(Tx1,Ty2));
-                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X2+Xc,Y2+Yc,Z2+Zc), stTextHeight);\r
+                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X2+Xc,Y2+Yc,Z2+Zc), stTextHeight);
               ptri->AddVertex(gp_Pnt(X3+Xc,Y3+Yc,Z3+Zc),
                        gp_Vec(X3/aRadius,Y3/aRadius,Z3/aRadius),
                        gp_Pnt2d(Tx2,Ty2));
-                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X3+Xc,Y3+Yc,Z3+Zc), stTextHeight);\r
+                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X3+Xc,Y3+Yc,Z3+Zc), stTextHeight);
             } else if( j == nbpanes/2-1 ) {
               ptri->AddVertex(gp_Pnt(X1+Xc,Y1+Yc,Z1+Zc),
                        gp_Vec(X1/aRadius,Y1/aRadius,Z1/aRadius),
                        gp_Pnt2d(Tx1,Ty1));
-                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X1+Xc,Y1+Yc,Z1+Zc), stTextHeight);\r
+                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X1+Xc,Y1+Yc,Z1+Zc), stTextHeight);
               ptri->AddVertex(gp_Pnt(X2+Xc,Y2+Yc,Z2+Zc),
                        gp_Vec(X2/aRadius,Y2/aRadius,Z2/aRadius),
                        gp_Pnt2d(Tx1,Ty2));
-                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X2+Xc,Y2+Yc,Z2+Zc), stTextHeight);\r
+                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X2+Xc,Y2+Yc,Z2+Zc), stTextHeight);
               ptri->AddVertex(gp_Pnt(X4+Xc,Y4+Yc,Z4+Zc),
                        gp_Vec(X4/aRadius,Y4/aRadius,Z4/aRadius),
                        gp_Pnt2d(Tx2,Ty1));
-                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X4+Xc,Y4+Yc,Z4+Zc), stTextHeight);\r
+                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X4+Xc,Y4+Yc,Z4+Zc), stTextHeight);
             } else {
               pquad->AddVertex(gp_Pnt(X1+Xc,Y1+Yc,Z1+Zc),
                        gp_Vec(X1/aRadius,Y1/aRadius,Z1/aRadius),
                        gp_Pnt2d(Tx1,Ty1));
-                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X1+Xc,Y1+Yc,Z1+Zc), stTextHeight);\r
+                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X1+Xc,Y1+Yc,Z1+Zc), stTextHeight);
               pquad->AddVertex(gp_Pnt(X2+Xc,Y2+Yc,Z2+Zc),
                        gp_Vec(X2/aRadius,Y2/aRadius,Z2/aRadius),
                        gp_Pnt2d(Tx1,Ty2));
-                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X2+Xc,Y2+Yc,Z2+Zc), stTextHeight);\r
+                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X2+Xc,Y2+Yc,Z2+Zc), stTextHeight);
               pquad->AddVertex(gp_Pnt(X3+Xc,Y3+Yc,Z3+Zc),
                        gp_Vec(X3/aRadius,Y3/aRadius,Z3/aRadius),
                        gp_Pnt2d(Tx2,Ty2));
-                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X3+Xc,Y3+Yc,Z3+Zc), stTextHeight);\r
+                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X3+Xc,Y3+Yc,Z3+Zc), stTextHeight);
               pquad->AddVertex(gp_Pnt(X4+Xc,Y4+Yc,Z4+Zc),
                        gp_Vec(X4/aRadius,Y4/aRadius,Z4/aRadius),
                        gp_Pnt2d(Tx2,Ty1));
-                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X4+Xc,Y4+Yc,Z4+Zc), stTextHeight);\r
+                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X4+Xc,Y4+Yc,Z4+Zc), stTextHeight);
             }
           }
         }
@@ -887,7 +887,7 @@ static void ShadeWithVertexNT(const Handle(Graphic3d_Group) aGroup,
       } else
 #endif
       {
-        aGroup->BeginPrimitives();\r
+        aGroup->BeginPrimitives();
         Graphic3d_Array1OfVertexNT TriVertex(1,3*nbpanes*2);
         Graphic3d_Array1OfVertexNT QuadVertex(1,4*nbpanes*(nbpanes/2-2));
         Aspect_Array1OfEdge TriEdge(1,3*nbpanes*2);
@@ -917,63 +917,63 @@ static void ShadeWithVertexNT(const Handle(Graphic3d_Group) aGroup,
             if( j == 0 ) {
               nt++;
               TriVertex(nt).SetCoord(X1+Xc,Y1+Yc,Z1+Zc);
-                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X1+Xc,Y1+Yc,Z1+Zc), stTextHeight);\r
+                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X1+Xc,Y1+Yc,Z1+Zc), stTextHeight);
              TriVertex(nt).SetNormal(X1/aRadius,Y1/aRadius,Z1/aRadius);
              TriVertex(nt).SetTextureCoordinate(Tx1,Ty1);
               TriEdge(nt).SetValues(nt,nt+1,Aspect_TOE_VISIBLE);
               nt++;
               TriVertex(nt).SetCoord(X2+Xc,Y2+Yc,Z2+Zc);
-                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X2+Xc,Y2+Yc,Z2+Zc), stTextHeight);\r
+                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X2+Xc,Y2+Yc,Z2+Zc), stTextHeight);
              TriVertex(nt).SetNormal(X2/aRadius,Y2/aRadius,Z2/aRadius);
              TriVertex(nt).SetTextureCoordinate(Tx1,Ty2);
               TriEdge(nt).SetValues(nt,nt+1,Aspect_TOE_VISIBLE);
               nt++;
               TriVertex(nt).SetCoord(X3+Xc,Y3+Yc,Z3+Zc);
-                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X3+Xc,Y3+Yc,Z3+Zc), stTextHeight);\r
+                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X3+Xc,Y3+Yc,Z3+Zc), stTextHeight);
              TriVertex(nt).SetNormal(X3/aRadius,Y3/aRadius,Z3/aRadius);
              TriVertex(nt).SetTextureCoordinate(Tx2,Ty2);
               TriEdge(nt).SetValues(nt,nt-2,Aspect_TOE_VISIBLE);
             } else if( j == nbpanes/2-1 ) {
               nt++;
               TriVertex(nt).SetCoord(X1+Xc,Y1+Yc,Z1+Zc);
-                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X1+Xc,Y1+Yc,Z1+Zc), stTextHeight);\r
+                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X1+Xc,Y1+Yc,Z1+Zc), stTextHeight);
              TriVertex(nt).SetNormal(X1/aRadius,Y1/aRadius,Z1/aRadius);
              TriVertex(nt).SetTextureCoordinate(Tx1,Ty1);
               TriEdge(nt).SetValues(nt,nt+1,Aspect_TOE_VISIBLE);
               nt++;
               TriVertex(nt).SetCoord(X2+Xc,Y2+Yc,Z2+Zc);
-                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X2+Xc,Y2+Yc,Z2+Zc), stTextHeight);\r
+                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X2+Xc,Y2+Yc,Z2+Zc), stTextHeight);
              TriVertex(nt).SetNormal(X2/aRadius,Y2/aRadius,Z2/aRadius);
              TriVertex(nt).SetTextureCoordinate(Tx1,Ty2);
               TriEdge(nt).SetValues(nt,nt+1,Aspect_TOE_VISIBLE);
               nt++;
               TriVertex(nt).SetCoord(X4+Xc,Y4+Yc,Z4+Zc);
-                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X4+Xc,Y4+Yc,Z4+Zc), stTextHeight);\r
+                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X4+Xc,Y4+Yc,Z4+Zc), stTextHeight);
              TriVertex(nt).SetNormal(X4/aRadius,Y4/aRadius,Z4/aRadius);
              TriVertex(nt).SetTextureCoordinate(Tx2,Ty1);
               TriEdge(nt).SetValues(nt,nt-2,Aspect_TOE_VISIBLE);
             } else {
               nq++;
               QuadVertex(nq).SetCoord(X1+Xc,Y1+Yc,Z1+Zc);
-                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X1+Xc,Y1+Yc,Z1+Zc), stTextHeight);\r
+                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X1+Xc,Y1+Yc,Z1+Zc), stTextHeight);
              QuadVertex(nq).SetNormal(X1/aRadius,Y1/aRadius,Z1/aRadius);
              QuadVertex(nq).SetTextureCoordinate(Tx1,Ty1);
               QuadEdge(nq).SetValues(nq,nq+1,Aspect_TOE_VISIBLE);
               nq++;
               QuadVertex(nq).SetCoord(X2+Xc,Y2+Yc,Z2+Zc);
-                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X2+Xc,Y2+Yc,Z2+Zc), stTextHeight);\r
+                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X2+Xc,Y2+Yc,Z2+Zc), stTextHeight);
              QuadVertex(nq).SetNormal(X2/aRadius,Y2/aRadius,Z2/aRadius);
              QuadVertex(nq).SetTextureCoordinate(Tx1,Ty2);
               QuadEdge(nq).SetValues(nq,nq+1,Aspect_TOE_VISIBLE);
               nq++;
               QuadVertex(nq).SetCoord(X3+Xc,Y3+Yc,Z3+Zc);
-                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X3+Xc,Y3+Yc,Z3+Zc), stTextHeight);\r
+                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X3+Xc,Y3+Yc,Z3+Zc), stTextHeight);
              QuadVertex(nq).SetNormal(X3/aRadius,Y3/aRadius,Z3/aRadius);
              QuadVertex(nq).SetTextureCoordinate(Tx2,Ty2);
               QuadEdge(nq).SetValues(nq,nq+1,Aspect_TOE_VISIBLE);
               nq++;
               QuadVertex(nq).SetCoord(X4+Xc,Y4+Yc,Z4+Zc);
-                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X4+Xc,Y4+Yc,Z4+Zc), stTextHeight);\r
+                         if(isText) aGroup->Text(stText,Graphic3d_Vertex(X4+Xc,Y4+Yc,Z4+Zc), stTextHeight);
              QuadVertex(nq).SetNormal(X4/aRadius,Y4/aRadius,Z4/aRadius);
              QuadVertex(nq).SetTextureCoordinate(Tx2,Ty1);
               QuadEdge(nq).SetValues(nq,nq-3,Aspect_TOE_VISIBLE);
@@ -997,15 +997,15 @@ Sphere_Sphere::Sphere_Sphere(const gp_Pnt& aPosition,
                         const Standard_Real aDeflection,
                         const Standard_Boolean hasVNormals,
                         const Standard_Boolean hasVColors,
-                        const Standard_Boolean hasVTexels,\r
-                        const Standard_Boolean hasText,\r
+                        const Standard_Boolean hasVTexels,
+                        const Standard_Boolean hasText,
                         const Standard_Boolean isOptText
 ) :
 Sphere_BasicShape(BRepPrimAPI_MakeSphere(aRadius).Shape(),
 aDeflection,hasVNormals,hasVColors,hasVTexels),
-myRadius(aRadius),\r
+myRadius(aRadius),
 myText(hasText),
-myOptText(isOptText)\r
+myOptText(isOptText)
 {
   gp_Trsf trsf;
   trsf.SetTranslation(gp_Vec(aPosition.X(),aPosition.Y(),aPosition.Z()));