[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Surface.java,1.34,1.35
Status: Pre-Alpha
Brought to you by:
henryml
From: Nordholt <nor...@us...> - 2005-09-30 18:32:18
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22017 Modified Files: Surface.java Log Message: removed out commented debugger code Index: Surface.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Surface.java,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** Surface.java 30 Sep 2005 11:15:34 -0000 1.34 --- Surface.java 30 Sep 2005 17:59:13 -0000 1.35 *************** *** 474,487 **** double tHole = holeDet / denominator; double epsilon = 0.00001; - //log.info("1st ineq: " + (Math.abs((surfOr.getX() + surfDir.getX() * tSurf) - - // (holeOr.getX() + holeDir.getX() * tHole)))); - //log.info("2st ineq: " + (Math.abs((surfOr.getY() + surfDir.getY() * tSurf) - - //(holeOr.getY() + holeDir.getY() * tHole)))); - //log.info("3st ineq: " + (Math.abs((surfOr.getZ() + surfDir.getZ() * tSurf) - - // (holeOr.getZ() + holeDir.getZ() * tHole)))); - //checking if there is an intersection and if it is within the line segments - //log.info("X: " + surfOr.getX() + "::" + holeOr.getX()); - //log.info("Y: " + surfOr.getY() + "::" + holeOr.getY()); - //log.info("Z: " + surfOr.getZ() + "::" + holeOr.getZ()); if ((tSurf > 0) && (tHole > 0) && (Math.abs((surfOr.getX() + surfDir.getX() * tSurf) - --- 474,477 ---- *************** *** 495,499 **** < epsilon)) { //the parameters for the "from" point on the edges - //log.info("Intersection"); double tSurfFrom = 0; double tHoleFrom = 0; --- 485,488 ---- *************** *** 517,524 **** } if (tHoleFrom > tHole && tSurfFrom >= tSurf) { - //log.info("not count base"); contained = false; } else if (tSurfFrom >= tSurf) { - //log.info("Count: " + crossings); crossings++; } --- 506,511 ---- *************** *** 527,531 **** } if (crossings % 2 == 0) { - //log.info("count based"); contained = false; } --- 514,517 ---- *************** *** 594,597 **** --- 580,597 ---- /** + * Removes the domain from the surface, if the given domain + * is either the front or back domain. + * @param domain the domain to remove. + */ + public void removeDomain(Domain domain) { + if (domain.equals(frontDomain)) { + setFrontDomain(null); + } + if (domain.equals(backDomain)) { + setBackDomain(null); + } + } + + /** * Returns the normal to this * @return A vector normal for this surface, null if the surface consists of only one edge |