Revision: 41183
http://brlcad.svn.sourceforge.net/brlcad/?rev=41183&view=rev
Author: brlcad
Date: 2010-10-29 18:39:15 +0000 (Fri, 29 Oct 2010)
Log Message:
-----------
more quellage
Modified Paths:
--------------
brlcad/trunk/src/conv/iges/add_face.c
brlcad/trunk/src/conv/iges/iges_struct.h
brlcad/trunk/src/conv/iges/main.c
brlcad/trunk/src/conv/iges/make_nurb_face.c
Modified: brlcad/trunk/src/conv/iges/add_face.c
===================================================================
--- brlcad/trunk/src/conv/iges/add_face.c 2010-10-29 18:38:54 UTC (rev
41182)
+++ brlcad/trunk/src/conv/iges/add_face.c 2010-10-29 18:39:15 UTC (rev
41183)
@@ -104,7 +104,7 @@
for ( loop=0; loop<no_of_loops; loop++ )
{
- if ( !Add_nurb_loop_to_face( s, fu, ((loop_de[loop]-1)/2),
face_orient ))
+ if ( !Add_nurb_loop_to_face( s, fu, ((loop_de[loop]-1)/2) ))
goto err;
}
NMG_CK_FACE_G_SNURB( fu->f_p->g.snurb_p );
Modified: brlcad/trunk/src/conv/iges/iges_struct.h
===================================================================
--- brlcad/trunk/src/conv/iges/iges_struct.h 2010-10-29 18:38:54 UTC (rev
41182)
+++ brlcad/trunk/src/conv/iges/iges_struct.h 2010-10-29 18:39:15 UTC (rev
41183)
@@ -212,7 +212,7 @@
BU_EXTERN( char *iges_type, (int type_no ) );
BU_EXTERN( char *Make_unique_brl_name, (char *name ) );
BU_EXTERN( int Add_loop_to_face, (struct shell *s, struct faceuse *fu, int
entityno, int face_orient ));
-BU_EXTERN( int Add_nurb_loop_to_face, ( struct shell *s, struct faceuse *fu,
int loop_entityno, int face_orient ) );
+BU_EXTERN( int Add_nurb_loop_to_face, ( struct shell *s, struct faceuse *fu,
int loop_entityno) );
BU_EXTERN( int arb_to_iges, ( struct rt_db_internal *ip, char *name, FILE
*fp_dir, FILE *fp_param ));
BU_EXTERN( int ell_to_iges, ( struct rt_db_internal *ip, char *name, FILE
*fp_dir, FILE *fp_param ));
BU_EXTERN( int nmg_to_iges, ( struct rt_db_internal *ip, char *name, FILE
*fp_dir, FILE *fp_param ));
Modified: brlcad/trunk/src/conv/iges/main.c
===================================================================
--- brlcad/trunk/src/conv/iges/main.c 2010-10-29 18:38:54 UTC (rev 41182)
+++ brlcad/trunk/src/conv/iges/main.c 2010-10-29 18:39:15 UTC (rev 41183)
@@ -92,7 +92,7 @@
{
int i;
int csg=0;
- int brep=0;
+ int b_rep=0;
int splines=0;
int tsurfs=0;
int drawing=0;
@@ -107,7 +107,7 @@
csg += typecount[i].count;
else if ( typecount[i].type == 186 ||
(typecount[i].type >= 502 && typecount[i].type <=514) )
- brep += typecount[i].count;
+ b_rep += typecount[i].count;
else if ( typecount[i].type == 128 )
splines += typecount[i].count;
else if ( typecount[i].type == 144 )
@@ -119,16 +119,16 @@
drawing += typecount[i].count;
}
- if ( (csg || brep) && (do_splines || do_drawings || trimmed_surf ) )
+ if ( (csg || b_rep) && (do_splines || do_drawings || trimmed_surf ) )
bu_log( msg1, iges_file );
- if ( drawing && csg == 0 && brep == 0 && !do_drawings )
+ if ( drawing && csg == 0 && b_rep == 0 && !do_drawings )
bu_log( msg2, iges_file );
- if ( splines && csg == 0 && brep == 0 && !do_splines )
+ if ( splines && csg == 0 && b_rep == 0 && !do_splines )
bu_log( msg3, iges_file );
- if ( tsurfs && csg == 0 && brep == 0 && !trimmed_surf )
+ if ( tsurfs && csg == 0 && b_rep == 0 && !trimmed_surf )
bu_log( msg4, iges_file );
}
Modified: brlcad/trunk/src/conv/iges/make_nurb_face.c
===================================================================
--- brlcad/trunk/src/conv/iges/make_nurb_face.c 2010-10-29 18:38:54 UTC (rev
41182)
+++ brlcad/trunk/src/conv/iges/make_nurb_face.c 2010-10-29 18:39:15 UTC (rev
41183)
@@ -25,11 +25,7 @@
#include "./iges_extern.h"
int
-Add_nurb_loop_to_face( s, fu, loop_entityno, face_orient )
- struct shell *s;
- struct faceuse *fu;
- int loop_entityno;
- int face_orient;
+Add_nurb_loop_to_face(struct shell *s, struct faceuse *fu, int loop_entityno)
{
int i, j, k;
int entity_type;
@@ -254,7 +250,6 @@
/* this edge runs to/from one vertex, need to split */
struct bu_list split_hd;
struct edge_g_cnurb *crv1, *crv2;
- point_t start_uv;
BU_LIST_INIT( &split_hd );
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Nokia and AT&T present the 2010 Calling All Innovators-North America contest
Create new apps & games for the Nokia N8 for consumers in U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store
http://p.sf.net/sfu/nokia-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
