[brlcad-commits] SF.net SVN: brlcad:[32856] brlcad/trunk

[<br...@us...>]

Revision: 32856
          http://brlcad.svn.sourceforge.net/brlcad/?rev=32856&view=rev
Author:   brlcad
Date:     2008-10-07 04:36:10 +0000 (Tue, 07 Oct 2008)

Log Message:
-----------
need to update the pnts in use in libged as well for the make command.  prefix all of the pnts types with RT_ since they are (presently) part of the API that you have to go through to use them.

Modified Paths:
--------------
    brlcad/trunk/include/rtgeom.h
    brlcad/trunk/src/libged/make.c
    brlcad/trunk/src/mged/typein.c

Modified: brlcad/trunk/include/rtgeom.h
===================================================================
--- brlcad/trunk/include/rtgeom.h	2008-10-06 20:53:35 UTC (rev 32855)
+++ brlcad/trunk/include/rtgeom.h	2008-10-07 04:36:10 UTC (rev 32856)
@@ -561,14 +561,14 @@
  */
 
 typedef enum {
-    PNT_TYPE_PNT = 0,
-    PNT_TYPE_COL = 0+1,
-    PNT_TYPE_SCA = 0+2,
-    PNT_TYPE_NRM = 0+4,
-    PNT_TYPE_COL_SCA = 0+1+2,
-    PNT_TYPE_COL_NRM = 0+1+4,
-    PNT_TYPE_SCA_NRM = 0+2+4,
-    PNT_TYPE_COL_SCA_NRM = 0+1+2+4
+    RT_PNT_TYPE_PNT = 0,
+    RT_PNT_TYPE_COL = 0+1,
+    RT_PNT_TYPE_SCA = 0+2,
+    RT_PNT_TYPE_NRM = 0+4,
+    RT_PNT_TYPE_COL_SCA = 0+1+2,
+    RT_PNT_TYPE_COL_NRM = 0+1+4,
+    RT_PNT_TYPE_SCA_NRM = 0+2+4,
+    RT_PNT_TYPE_COL_SCA_NRM = 0+1+2+4
 } rt_pnt_type;
 
 struct pnt {

Modified: brlcad/trunk/src/libged/make.c
===================================================================
--- brlcad/trunk/src/libged/make.c	2008-10-06 20:53:35 UTC (rev 32855)
+++ brlcad/trunk/src/libged/make.c	2008-10-07 04:36:10 UTC (rev 32856)
@@ -586,6 +586,7 @@
 	BU_LIST_INSERT(&pipe_ip->pipe_segs_head, &ps->l);
     } else if (strcmp(argv[bu_optind + 1], "pnts") == 0) {
 	struct pnt *point;
+	struct pnt *headPoint;
 
 	internal.idb_major_type = DB5_MAJORTYPE_BRLCAD;
 	internal.idb_type = ID_PNTS;
@@ -594,14 +595,16 @@
 
 	pnts_ip = (struct rt_pnts_internal *) internal.idb_ptr;
 	pnts_ip->magic = RT_PNTS_INTERNAL_MAGIC;
-	pnts_ip->numPoints = 1;
-	pnts_ip->weight = 0;
+	pnts_ip->count = 1;
+	pnts_ip->type = RT_PNT_TYPE_PNT;
+	pnts_ip->scale = 0;
 
-	BU_GETSTRUCT(pnts_ip->vList, pnt);
-	BU_LIST_INIT(&pnts_ip->vList->l);
+	BU_GETSTRUCT(pnts_ip->point, pnt);
+	headPoint = pnts_ip->point;
+	BU_LIST_INIT(&headPoint->l);
 	BU_GETSTRUCT(point, pnt);
 	VSET(point->v, origin[X], origin[Y], origin[Z]);
-	BU_LIST_PUSH(&pnts_ip->vList->l, &point->l);
+	BU_LIST_PUSH(&headPoint->l, &point->l);
 
     } else if (strcmp(argv[bu_optind+1], "bot") == 0) {
 	internal.idb_major_type = DB5_MAJORTYPE_BRLCAD;

Modified: brlcad/trunk/src/mged/typein.c
===================================================================
--- brlcad/trunk/src/mged/typein.c	2008-10-06 20:53:35 UTC (rev 32855)
+++ brlcad/trunk/src/mged/typein.c	2008-10-07 04:36:10 UTC (rev 32856)
@@ -2952,7 +2952,7 @@
     pnts = (struct rt_pnts_internal *) intern->idb_ptr;
     pnts->magic = RT_PNTS_INTERNAL_MAGIC;
     pnts->scale = scale;
-    pnts->type = PNT_TYPE_PNT;
+    pnts->type = RT_PNT_TYPE_PNT;
     pnts->count = numPoints;
     headPoint = pnts->point;
     BU_GETSTRUCT(headPoint, pnt); /* empty list head */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.