Ignore:
Timestamp:
Oct 27, 2009, 5:41:12 PM (16 years ago)
Author:
Frederik Heber <heber@…>
Children:
dbc152
Parents:
069034
Message:

Refactored tesselationhelpers.cpp with respect to ticket #38 (make const what is const).
Signed-off-by: Frederik Heber <heber@…>

File:
1 edited

Legend:

Unmodified
Added
Removed
  • molecuilder/src/tesselation.cpp

    r069034 r6d7651  
    17461746
    17471747    // construct old center
    1748     GetCenterofCircumcircle(&OldSphereCenter, T.endpoints[0]->node->node, T.endpoints[1]->node->node, T.endpoints[2]->node->node);
     1748    GetCenterofCircumcircle(&OldSphereCenter, *T.endpoints[0]->node->node, *T.endpoints[1]->node->node, *T.endpoints[2]->node->node);
    17491749    helper.CopyVector(&T.NormalVector);  // normal vector ensures that this is correct center of the two possible ones
    17501750    radius = Line.endpoints[0]->node->node->DistanceSquared(&OldSphereCenter);
     
    18051805      AddTesselationPoint(BaseRay->endpoints[1]->node, 2);
    18061806
    1807       if (CheckLineCriteriaForDegeneratedTriangle((const BoundaryPointSet **)TPS)) {
     1807      if (CheckLineCriteriaForDegeneratedTriangle((const BoundaryPointSet ** const )TPS)) {
    18081808        AddTesselationLine(TPS[0], TPS[1], 0);
    18091809        AddTesselationLine(TPS[0], TPS[2], 1);
     
    18341834        // We demand that at most one new degenerate line is created and that this line also already exists (which has to be the case due to existentTrianglesCount == 1)
    18351835        // i.e. at least one of the three lines must be present with TriangleCount <= 1
    1836         if (CheckLineCriteriaForDegeneratedTriangle((const BoundaryPointSet **)TPS)) {
     1836        if (CheckLineCriteriaForDegeneratedTriangle((const BoundaryPointSet ** const)TPS)) {
    18371837          AddTesselationLine(TPS[0], TPS[1], 0);
    18381838          AddTesselationLine(TPS[0], TPS[2], 1);
     
    19961996
    19971997  // calculate volume
    1998   volume = CalculateVolumeofGeneralTetraeder(Base->endpoints[1]->node->node, OtherBase->endpoints[0]->node->node, OtherBase->endpoints[1]->node->node, Base->endpoints[0]->node->node);
     1998  volume = CalculateVolumeofGeneralTetraeder(*Base->endpoints[1]->node->node, *OtherBase->endpoints[0]->node->node, *OtherBase->endpoints[1]->node->node, *Base->endpoints[0]->node->node);
    19991999
    20002000  // delete the temporary other base line and the closest points
     
    23612361
    23622362                  // construct both new centers
    2363                   GetCenterofCircumcircle(&NewSphereCenter, BaseLine->endpoints[0]->node->node, BaseLine->endpoints[1]->node->node, Candidate->node);
     2363                  GetCenterofCircumcircle(&NewSphereCenter, *BaseLine->endpoints[0]->node->node, *BaseLine->endpoints[1]->node->node, *Candidate->node);
    23642364                  OtherNewSphereCenter.CopyVector(&NewSphereCenter);
    23652365
     
    31383138        AddTesselationTriangle();
    31393139        // calculate volume summand as a general tetraeder
    3140         volume += CalculateVolumeofGeneralTetraeder(TPS[0]->node->node, TPS[1]->node->node, TPS[2]->node->node, &OldPoint);
     3140        volume += CalculateVolumeofGeneralTetraeder(*TPS[0]->node->node, *TPS[1]->node->node, *TPS[2]->node->node, OldPoint);
    31413141        // advance number
    31423142        count++;
Note: See TracChangeset for help on using the changeset viewer.