[Igarden-commit] Garden/source/LayoutDB ArcPath.cpp, 1.19.2.1, 1.19.2.2 SimplePath.cpp, 1.17.2.1, 1
Status: Beta
Brought to you by:
jlbedell
|
From: Jeffrey B. <jlb...@us...> - 2006-11-11 14:58:42
|
Update of /cvsroot/igarden/Garden/source/LayoutDB In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv23495 Modified Files: Tag: Release_branch_v1 ArcPath.cpp SimplePath.cpp PlanGroup.cp FreehandPath.cpp Log Message: Split tessellation object off of RGGLView Index: SimplePath.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/LayoutDB/SimplePath.cpp,v retrieving revision 1.17.2.1 retrieving revision 1.17.2.2 diff -C2 -d -r1.17.2.1 -r1.17.2.2 *** SimplePath.cpp 2 Nov 2006 23:26:59 -0000 1.17.2.1 --- SimplePath.cpp 11 Nov 2006 14:58:39 -0000 1.17.2.2 *************** *** 761,778 **** if(_inPathBackdropList == 0) _inPathBackdropList = glGenLists(1); ! planView->BeginTesselation(_inPathBackdropList, count*2, _originalOffset.xOffset, _originalOffset.yOffset, xSize, ySize); ! planView->BeginTessContour(); for(n = 0; n < count; n++) { destPoint = leftPoints[n]; ! planView->AddTessPoint(destPoint.xOffset, destPoint.yOffset, kBackGroundZ); } for(n = count-1; n >= 0; n--) { destPoint = rightPoints[n]; ! planView->AddTessPoint(destPoint.xOffset, destPoint.yOffset, kBackGroundZ); } ! planView->EndTessContour(); ! planView->EndTesselation(); _rebuildBackdrop = false; PathClean(); --- 761,778 ---- if(_inPathBackdropList == 0) _inPathBackdropList = glGenLists(1); ! planView->tessellation.Begin(_inPathBackdropList, count*2, _originalOffset.xOffset, _originalOffset.yOffset, xSize, ySize); ! planView->tessellation.BeginContour(); for(n = 0; n < count; n++) { destPoint = leftPoints[n]; ! planView->tessellation.AddPoint(destPoint.xOffset, destPoint.yOffset, kBackGroundZ); } for(n = count-1; n >= 0; n--) { destPoint = rightPoints[n]; ! planView->tessellation.AddPoint(destPoint.xOffset, destPoint.yOffset, kBackGroundZ); } ! planView->tessellation.EndContour(); ! planView->tessellation.End(); _rebuildBackdrop = false; PathClean(); Index: PlanGroup.cp =================================================================== RCS file: /cvsroot/igarden/Garden/source/LayoutDB/PlanGroup.cp,v retrieving revision 1.34.2.1 retrieving revision 1.34.2.2 diff -C2 -d -r1.34.2.1 -r1.34.2.2 *** PlanGroup.cp 2 Nov 2006 23:41:26 -0000 1.34.2.1 --- PlanGroup.cp 11 Nov 2006 14:58:39 -0000 1.34.2.2 *************** *** 769,781 **** glShadeModel(GL_FLAT); ! planView->BeginTesselation(_list, count, _originalOffset.xOffset, _originalOffset.yOffset, xSize, ySize); ! planView->BeginTessContour(); for(n = 0; n < count; n++) // Already did point zero { pt = GetIndexedPathPoint(n); ! planView->AddTessPoint(pt.xOffset, pt.yOffset, pt.zOffset); } ! planView->EndTessContour(); ! planView->EndTesselation(); glCallList(_list); _recalcBackdrop = false; --- 769,781 ---- glShadeModel(GL_FLAT); ! planView->tessellation.Begin(_list, count, _originalOffset.xOffset, _originalOffset.yOffset, xSize, ySize); ! planView->tessellation.BeginContour(); for(n = 0; n < count; n++) // Already did point zero { pt = GetIndexedPathPoint(n); ! planView->tessellation.AddPoint(pt.xOffset, pt.yOffset, pt.zOffset); } ! planView->tessellation.EndContour(); ! planView->tessellation.End(); glCallList(_list); _recalcBackdrop = false; Index: ArcPath.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/LayoutDB/ArcPath.cpp,v retrieving revision 1.19.2.1 retrieving revision 1.19.2.2 diff -C2 -d -r1.19.2.1 -r1.19.2.2 *** ArcPath.cpp 1 Nov 2006 03:09:47 -0000 1.19.2.1 --- ArcPath.cpp 11 Nov 2006 14:58:39 -0000 1.19.2.2 *************** *** 295,307 **** _list = glGenLists(1); glShadeModel(GL_FLAT); ! planView->BeginTesselation(_list, count, _originalOffset.xOffset, _originalOffset.yOffset, xSize, ySize); ! planView->BeginTessContour(); for(n = 0; n < count; n++) { pt = GetIndexedPathPoint(n); ! planView->AddTessPoint(pt.xOffset, pt.yOffset, pt.zOffset); } ! planView->EndTessContour(); ! planView->EndTesselation(); glCallList(_list); _recalcBackdrop = false; --- 295,307 ---- _list = glGenLists(1); glShadeModel(GL_FLAT); ! planView->tessellation.Begin(_list, count, _originalOffset.xOffset, _originalOffset.yOffset, xSize, ySize); ! planView->tessellation.BeginContour(); for(n = 0; n < count; n++) { pt = GetIndexedPathPoint(n); ! planView->tessellation.AddPoint(pt.xOffset, pt.yOffset, pt.zOffset); } ! planView->tessellation.EndContour(); ! planView->tessellation.End(); glCallList(_list); _recalcBackdrop = false; Index: FreehandPath.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/LayoutDB/FreehandPath.cpp,v retrieving revision 1.41.2.1 retrieving revision 1.41.2.2 diff -C2 -d -r1.41.2.1 -r1.41.2.2 *** FreehandPath.cpp 1 Nov 2006 03:09:47 -0000 1.41.2.1 --- FreehandPath.cpp 11 Nov 2006 14:58:39 -0000 1.41.2.2 *************** *** 482,494 **** if(_enclosedBackdropList == 0) _enclosedBackdropList = glGenLists(1); ! planView->BeginTesselation(_enclosedBackdropList, count, _originalOffset.xOffset, _originalOffset.yOffset, xSize, ySize); ! planView->BeginTessContour(); for(n = 0; n < count; n++) { pt = GetIndexedAnchorPoint(n); ! planView->AddTessPoint(pt.xOffset, pt.yOffset, kBackGroundZ); } ! planView->EndTessContour(); ! planView->EndTesselation(); } --- 482,494 ---- if(_enclosedBackdropList == 0) _enclosedBackdropList = glGenLists(1); ! planView->tessellation.Begin(_enclosedBackdropList, count, _originalOffset.xOffset, _originalOffset.yOffset, xSize, ySize); ! planView->tessellation.BeginContour(); for(n = 0; n < count; n++) { pt = GetIndexedAnchorPoint(n); ! planView->tessellation.AddPoint(pt.xOffset, pt.yOffset, kBackGroundZ); } ! planView->tessellation.EndContour(); ! planView->tessellation.End(); } |