clip plqnes

Graphics/Mesh.cpp

-/* $Id: Mesh.cpp,v 1.9 2000-12-04 09:29:38 colignon Exp $ */
+/* $Id: Mesh.cpp,v 1.10 2000-12-04 09:51:51 geuzaine Exp $ */
 
 #include "Gmsh.h"
 #include "GmshUI.h"
@@ -60,8 +60,9 @@ void Draw_Mesh (Mesh *M) {
   InitPosition();
 
   for(i = 0 ; i < 6 ; i++)
-    if(CTX.clip[i]) glClipPlane(GL_CLIP_PLANE0 + i, CTX.clip_plane[i]);
-  
+    if(CTX.clip[i])
+      glClipPlane(GL_CLIP_PLANE0 + i, CTX.clip_plane[i]);
+
   glPointSize(2);
   glLineWidth(1);
 

Parser/Gmsh.tab.cpp.h

@@ -6,146 +6,146 @@ typedef union {
   Shape    s;
   List_T  *l;
 } YYSTYPE;
-#define	tDOUBLE	258
-#define	tSTRING	259
-#define	tBIGSTR	260
-#define	tEND	261
-#define	tAFFECT	262
-#define	tDOTS	263
-#define	tPi	264
-#define	tExp	265
-#define	tLog	266
-#define	tLog10	267
-#define	tSqrt	268
-#define	tSin	269
-#define	tAsin	270
-#define	tCos	271
-#define	tAcos	272
-#define	tTan	273
-#define	tAtan	274
-#define	tAtan2	275
-#define	tSinh	276
-#define	tCosh	277
-#define	tTanh	278
-#define	tFabs	279
-#define	tFloor	280
-#define	tCeil	281
-#define	tFmod	282
-#define	tModulo	283
-#define	tHypot	284
-#define	tPoint	285
-#define	tCircle	286
-#define	tEllipsis	287
-#define	tLine	288
-#define	tSurface	289
-#define	tSpline	290
-#define	tVolume	291
-#define	tCharacteristic	292
-#define	tLength	293
-#define	tParametric	294
-#define	tElliptic	295
-#define	tPlane	296
-#define	tRuled	297
-#define	tTransfinite	298
-#define	tComplex	299
-#define	tPhysical	300
-#define	tUsing	301
-#define	tPower	302
-#define	tBump	303
-#define	tProgression	304
-#define	tAssociation	305
-#define	tRotate	306
-#define	tTranslate	307
-#define	tSymmetry	308
-#define	tDilate	309
-#define	tExtrude	310
-#define	tDuplicata	311
-#define	tLoop	312
-#define	tInclude	313
-#define	tRecombine	314
-#define	tDelete	315
-#define	tCoherence	316
-#define	tView	317
-#define	tOffset	318
-#define	tAttractor	319
-#define	tLayers	320
-#define	tScalarTetrahedron	321
-#define	tVectorTetrahedron	322
-#define	tTensorTetrahedron	323
-#define	tScalarTriangle	324
-#define	tVectorTriangle	325
-#define	tTensorTriangle	326
-#define	tScalarLine	327
-#define	tVectorLine	328
-#define	tTensorLine	329
-#define	tScalarPoint	330
-#define	tVectorPoint	331
-#define	tTensorPoint	332
-#define	tBSpline	333
-#define	tNurbs	334
-#define	tOrder	335
-#define	tWith	336
-#define	tBounds	337
-#define	tKnots	338
-#define	tColor	339
-#define	tGeneral	340
-#define	tGeometry	341
-#define	tMesh	342
-#define	tClip	343
-#define	tB_SPLINE_SURFACE_WITH_KNOTS	344
-#define	tB_SPLINE_CURVE_WITH_KNOTS	345
-#define	tCARTESIAN_POINT	346
-#define	tTRUE	347
-#define	tFALSE	348
-#define	tUNSPECIFIED	349
-#define	tU	350
-#define	tV	351
-#define	tEDGE_CURVE	352
-#define	tVERTEX_POINT	353
-#define	tORIENTED_EDGE	354
-#define	tPLANE	355
-#define	tFACE_OUTER_BOUND	356
-#define	tEDGE_LOOP	357
-#define	tADVANCED_FACE	358
-#define	tVECTOR	359
-#define	tDIRECTION	360
-#define	tAXIS2_PLACEMENT_3D	361
-#define	tISO	362
-#define	tENDISO	363
-#define	tENDSEC	364
-#define	tDATA	365
-#define	tHEADER	366
-#define	tFILE_DESCRIPTION	367
-#define	tFILE_SCHEMA	368
-#define	tFILE_NAME	369
-#define	tMANIFOLD_SOLID_BREP	370
-#define	tCLOSED_SHELL	371
-#define	tADVANCED_BREP_SHAPE_REPRESENTATION	372
-#define	tFACE_BOUND	373
-#define	tCYLINDRICAL_SURFACE	374
-#define	tCONICAL_SURFACE	375
-#define	tCIRCLE	376
-#define	tTRIMMED_CURVE	377
-#define	tGEOMETRIC_SET	378
-#define	tCOMPOSITE_CURVE_SEGMENT	379
-#define	tCONTINUOUS	380
-#define	tCOMPOSITE_CURVE	381
-#define	tTOROIDAL_SURFACE	382
-#define	tPRODUCT_DEFINITION	383
-#define	tPRODUCT_DEFINITION_SHAPE	384
-#define	tSHAPE_DEFINITION_REPRESENTATION	385
-#define	tELLIPSE	386
-#define	tTrimmed	387
-#define	tSolid	388
-#define	tEndSolid	389
-#define	tVertex	390
-#define	tFacet	391
-#define	tNormal	392
-#define	tOuter	393
-#define	tLoopSTL	394
-#define	tEndLoop	395
-#define	tEndFacet	396
-#define	UMINUS	397
+#define	tDOUBLE	257
+#define	tSTRING	258
+#define	tBIGSTR	259
+#define	tEND	260
+#define	tAFFECT	261
+#define	tDOTS	262
+#define	tPi	263
+#define	tExp	264
+#define	tLog	265
+#define	tLog10	266
+#define	tSqrt	267
+#define	tSin	268
+#define	tAsin	269
+#define	tCos	270
+#define	tAcos	271
+#define	tTan	272
+#define	tAtan	273
+#define	tAtan2	274
+#define	tSinh	275
+#define	tCosh	276
+#define	tTanh	277
+#define	tFabs	278
+#define	tFloor	279
+#define	tCeil	280
+#define	tFmod	281
+#define	tModulo	282
+#define	tHypot	283
+#define	tPoint	284
+#define	tCircle	285
+#define	tEllipsis	286
+#define	tLine	287
+#define	tSurface	288
+#define	tSpline	289
+#define	tVolume	290
+#define	tCharacteristic	291
+#define	tLength	292
+#define	tParametric	293
+#define	tElliptic	294
+#define	tPlane	295
+#define	tRuled	296
+#define	tTransfinite	297
+#define	tComplex	298
+#define	tPhysical	299
+#define	tUsing	300
+#define	tPower	301
+#define	tBump	302
+#define	tProgression	303
+#define	tAssociation	304
+#define	tRotate	305
+#define	tTranslate	306
+#define	tSymmetry	307
+#define	tDilate	308
+#define	tExtrude	309
+#define	tDuplicata	310
+#define	tLoop	311
+#define	tInclude	312
+#define	tRecombine	313
+#define	tDelete	314
+#define	tCoherence	315
+#define	tView	316
+#define	tOffset	317
+#define	tAttractor	318
+#define	tLayers	319
+#define	tScalarTetrahedron	320
+#define	tVectorTetrahedron	321
+#define	tTensorTetrahedron	322
+#define	tScalarTriangle	323
+#define	tVectorTriangle	324
+#define	tTensorTriangle	325
+#define	tScalarLine	326
+#define	tVectorLine	327
+#define	tTensorLine	328
+#define	tScalarPoint	329
+#define	tVectorPoint	330
+#define	tTensorPoint	331
+#define	tBSpline	332
+#define	tNurbs	333
+#define	tOrder	334
+#define	tWith	335
+#define	tBounds	336
+#define	tKnots	337
+#define	tColor	338
+#define	tGeneral	339
+#define	tGeometry	340
+#define	tMesh	341
+#define	tClip	342
+#define	tB_SPLINE_SURFACE_WITH_KNOTS	343
+#define	tB_SPLINE_CURVE_WITH_KNOTS	344
+#define	tCARTESIAN_POINT	345
+#define	tTRUE	346
+#define	tFALSE	347
+#define	tUNSPECIFIED	348
+#define	tU	349
+#define	tV	350
+#define	tEDGE_CURVE	351
+#define	tVERTEX_POINT	352
+#define	tORIENTED_EDGE	353
+#define	tPLANE	354
+#define	tFACE_OUTER_BOUND	355
+#define	tEDGE_LOOP	356
+#define	tADVANCED_FACE	357
+#define	tVECTOR	358
+#define	tDIRECTION	359
+#define	tAXIS2_PLACEMENT_3D	360
+#define	tISO	361
+#define	tENDISO	362
+#define	tENDSEC	363
+#define	tDATA	364
+#define	tHEADER	365
+#define	tFILE_DESCRIPTION	366
+#define	tFILE_SCHEMA	367
+#define	tFILE_NAME	368
+#define	tMANIFOLD_SOLID_BREP	369
+#define	tCLOSED_SHELL	370
+#define	tADVANCED_BREP_SHAPE_REPRESENTATION	371
+#define	tFACE_BOUND	372
+#define	tCYLINDRICAL_SURFACE	373
+#define	tCONICAL_SURFACE	374
+#define	tCIRCLE	375
+#define	tTRIMMED_CURVE	376
+#define	tGEOMETRIC_SET	377
+#define	tCOMPOSITE_CURVE_SEGMENT	378
+#define	tCONTINUOUS	379
+#define	tCOMPOSITE_CURVE	380
+#define	tTOROIDAL_SURFACE	381
+#define	tPRODUCT_DEFINITION	382
+#define	tPRODUCT_DEFINITION_SHAPE	383
+#define	tSHAPE_DEFINITION_REPRESENTATION	384
+#define	tELLIPSE	385
+#define	tTrimmed	386
+#define	tSolid	387
+#define	tEndSolid	388
+#define	tVertex	389
+#define	tFacet	390
+#define	tNormal	391
+#define	tOuter	392
+#define	tLoopSTL	393
+#define	tEndLoop	394
+#define	tEndFacet	395
+#define	UMINUS	396
 
 
 extern YYSTYPE yylval;

Parser/Gmsh.y

-%{ /* $Id: Gmsh.y,v 1.10 2000-12-04 09:29:38 colignon Exp $ */
+%{ /* $Id: Gmsh.y,v 1.11 2000-12-04 09:51:51 geuzaine Exp $ */
 
 #include <stdarg.h>
 
@@ -1311,7 +1311,7 @@ Coherence :
 
 Options :
     tColor '{' ColorSections '}'
-  | tClip tPlane '(' FExpr ')' tAFFECT '{' FExpr ',' FExpr ',' FExpr ',' FExpr '}'
+  | tClip tPlane '(' FExpr ')' tAFFECT '{' FExpr ',' FExpr ',' FExpr ',' FExpr '}' tEND
     {
       i = (int)$4 ;
       if(i < 0 || i > 5)
@@ -1319,9 +1319,9 @@ Options :
       else{
 	CTX.clip[i] = 1;
 	CTX.clip_plane[i][0] = $8;
-	CTX.clip_plane[i][0] = $10;
-	CTX.clip_plane[i][0] = $12;
-	CTX.clip_plane[i][0] = $14;
+	CTX.clip_plane[i][1] = $10;
+	CTX.clip_plane[i][2] = $12;
+	CTX.clip_plane[i][3] = $14;
       }
     }
 ;

Parser/Gmsh.yy.cpp

@@ -2,7 +2,7 @@
 /* A lexical scanner generated by flex */
 
 /* Scanner skeleton version:
- * $Header: /cvsroot/gmsh/Parser/Gmsh.yy.cpp,v 1.12 2000-12-04 09:29:39 colignon Exp $
+ * $Header: /cvsroot/gmsh/Parser/Gmsh.yy.cpp,v 1.13 2000-12-04 09:51:51 geuzaine Exp $
  */
 
 #define FLEX_SCANNER
@@ -1135,7 +1135,7 @@ YY_MALLOC_DECL
 YY_DECL
 	{
 	register yy_state_type yy_current_state;
-	register char *yy_cp, *yy_bp;
+	register char *yy_cp = NULL, *yy_bp = NULL;
 	register int yy_act;
 
 #line 60 "Gmsh.l"