[Igarden-commit] Garden/source/LayoutDB BSPNode.cpp, 1.28.2.1, 1.28.2.2 BSPNode.h, 1.15, 1.15.2.1
Status: Beta
Brought to you by:
jlbedell
|
From: Jeffrey B. <jlb...@us...> - 2006-11-15 03:54:58
|
Update of /cvsroot/igarden/Garden/source/LayoutDB In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv4320 Modified Files: Tag: Release_branch_v1 BSPNode.cpp BSPNode.h Log Message: Add PurchaseReport Index: BSPNode.h =================================================================== RCS file: /cvsroot/igarden/Garden/source/LayoutDB/BSPNode.h,v retrieving revision 1.15 retrieving revision 1.15.2.1 diff -C2 -d -r1.15 -r1.15.2.1 *** BSPNode.h 20 Sep 2005 23:23:17 -0000 1.15 --- BSPNode.h 15 Nov 2006 03:54:56 -0000 1.15.2.1 *************** *** 39,43 **** public: void AddToMaterialArray(materialArray_t *list, XGUUID& uid); ! void AddToReferenceArray(materialRefArray_t* list, XGUUID& uid); // methods BSPNode(planRectangle_t bounds, bool splitHoriz = true, BSPNode* parent = NULL); --- 39,43 ---- public: void AddToMaterialArray(materialArray_t *list, XGUUID& uid); ! void AddToReferenceArray(pathELementArray_t* list, XGUUID& uid); // methods BSPNode(planRectangle_t bounds, bool splitHoriz = true, BSPNode* parent = NULL); Index: BSPNode.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/LayoutDB/BSPNode.cpp,v retrieving revision 1.28.2.1 retrieving revision 1.28.2.2 diff -C2 -d -r1.28.2.1 -r1.28.2.2 *** BSPNode.cpp 1 Nov 2006 03:09:47 -0000 1.28.2.1 --- BSPNode.cpp 15 Nov 2006 03:54:56 -0000 1.28.2.2 *************** *** 27,30 **** --- 27,31 ---- #include "Material.h" #include "Path.h" + #include "GardenPlot.h" #define MAX_NODE_ELEMENTS 50 *************** *** 1039,1061 **** // --------------------------------------------------------------------------- // ! void BSPNode::AddToReferenceArray(materialRefArray_t* list, XGUUID& uid) { ! Element *elem; MaterialRef *ref; Int32 n, count; materialID_t myID, testID; XGUUID plotID, nilID; count = _elements.Length(); for(n = 0; n < count; n++) { ! elem = _elements[n]; ! ref = dynamic_cast<MaterialRef*>(elem); ! if(ref != NULL) { ! ref->GetPlotID(plotID); ! if(plotID == uid || uid == nilID) { ! list->push_back(ref); } } --- 1040,1066 ---- // --------------------------------------------------------------------------- // ! void BSPNode::AddToReferenceArray(pathELementArray_t* list, XGUUID& uid) { ! PathElement *elem; MaterialRef *ref; Int32 n, count; materialID_t myID, testID; XGUUID plotID, nilID; + GardenPlot *plot; count = _elements.Length(); for(n = 0; n < count; n++) { ! elem = dynamic_cast<PathElement*>(_elements[n]); ! if(elem != NULL) { ! plot = elem->GetPlot(); ! if(plot != NULL) { ! plot->getPlotID(plotID); ! if(plotID == uid || uid == nilID) ! { ! list->push_back(elem); ! } } } |