[brlcad-commits] SF.net SVN: brlcad:[66141] brlcad/trunk/include/brep.h

[<sta...@us...>]

Revision: 66141
          http://sourceforge.net/p/brlcad/code/66141
Author:   starseeker
Date:     2015-09-01 16:33:42 +0000 (Tue, 01 Sep 2015)
Log Message:
-----------
Reorganize subbrep_object_data struct a bit

Modified Paths:
--------------
    brlcad/trunk/include/brep.h

Modified: brlcad/trunk/include/brep.h
===================================================================
--- brlcad/trunk/include/brep.h	2015-09-01 14:16:06 UTC (rev 66140)
+++ brlcad/trunk/include/brep.h	2015-09-01 16:33:42 UTC (rev 66141)
@@ -1392,30 +1392,15 @@
 };
 
 struct subbrep_object_data {
-    struct bu_vls *key;
-    struct bu_vls *name_root;
-    int *obj_cnt;
-    int *faces;
-    int *loops;
-    int *edges;
-    int *fol; /* Faces with outer loops in object loop network */
-    int *fil; /* Faces with only inner loops in object loop network */
-    int faces_cnt;
-    int loops_cnt;
-    int edges_cnt;
-    int fol_cnt;
-    int fil_cnt;
+    /* Context information */
+    const ON_Brep *brep;
+    subbrep_object_data *parent;
 
-    const ON_Brep *brep;
+    /* Shape representation data */
     ON_Brep *local_brep;
-    int type;
     csg_object_params *params;
     subbrep_object_data *planar_obj;
-    int planar_obj_vert_cnt;
-    int *planar_obj_vert_map;
-    subbrep_object_data *parent;
     struct bu_ptbl *children;
-    int is_island;
     /* Irrespective of the broader context, is the shape
      * itself negative?  This is not meaningful for general
      * combs, but individual shapes like cylinders and spheres
@@ -1425,13 +1410,34 @@
      *  1 = positive
      *  0 = unknown/unset */
     int negative_shape;
-    ON_BoundingBox *bbox;
-    int bbox_set;
-    int obj_id;
     /* For some objects, additional post processing is needed
      * for a subtract/no-subtract determination */
+    struct bu_ptbl *subtraction_candidates;
+
+    /* subbrep metadata */
+    struct bu_vls *key;
+    struct bu_vls *name_root;
     struct bu_vls *obj_name;
-    struct bu_ptbl *subtraction_candidates;
+    int obj_id;
+    int is_island;
+    ON_BoundingBox *bbox;
+    int bbox_set;
+
+    /* Working information - should probably be in private struct */
+    int *obj_cnt;
+    int *faces;
+    int *loops;
+    int *edges;
+    int *fol; /* Faces with outer loops in object loop network */
+    int *fil; /* Faces with only inner loops in object loop network */
+    int faces_cnt;
+    int loops_cnt;
+    int edges_cnt;
+    int fol_cnt;
+    int fil_cnt;
+    int planar_obj_vert_cnt;
+    int *planar_obj_vert_map;
+    int type;
 };
 
 extern BREP_EXPORT void subbrep_bbox(struct subbrep_object_data *obj);

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