[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Geometry.java, 1.22, 1.23
Status: Pre-Alpha
Brought to you by:
henryml
From: rimestad <rim...@us...> - 2006-07-24 13:18:11
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv24780/src/net/sourceforge/bprocessor/model Modified Files: Geometry.java Log Message: Fixed rotationAbout methods Index: Geometry.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Geometry.java,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** Geometry.java 19 Jul 2006 12:04:13 -0000 1.22 --- Geometry.java 24 Jul 2006 13:18:06 -0000 1.23 *************** *** 718,729 **** */ public static double degreesAboutZ(Vertex dir) { ! Vertex tmp; ! if (dir.getX() != 0.0) { ! tmp = new Vertex(dir.getX(), dir.getY(), 0); ! } else { ! tmp = new Vertex(0, dir.getY(), dir.getZ()); ! } tmp.normalize(); ! if (dir.getY() < 0) { return -Math.acos(tmp.getX()); } else { --- 718,727 ---- */ public static double degreesAboutZ(Vertex dir) { ! Vertex tmp = new Vertex(dir.getX(), dir.getY(), 0); tmp.normalize(); ! if (tmp.getX() == 0.0 && tmp.getY() == 0.0) { ! return 0; ! } ! if (dir.getY() < 0.0) { return -Math.acos(tmp.getX()); } else { *************** *** 738,747 **** */ public static double degreesAboutY(Vertex dir) { ! Vertex tmp; ! if (dir.getX() != 0.0) { ! tmp = new Vertex(dir.getX(), 0, dir.getZ()); ! } else { ! tmp = new Vertex(0, dir.getY(), dir.getZ()); ! } tmp.normalize(); return Math.asin(tmp.getZ()); --- 736,740 ---- */ public static double degreesAboutY(Vertex dir) { ! Vertex tmp = dir.copy(); tmp.normalize(); return Math.asin(tmp.getZ()); |