X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=libctsupport%2Fclip.cpp;h=f99c20fa46e0dec770bfdc50cbfe305f261a5896;hb=1e88cf0f7fa4f690ea9f110e8ed3f2b5338d0a10;hp=4aa6f019a50291392e874af8efce63aff1e1fba6;hpb=99dd1d6ed10db1f669a5fe6af71225a50fc0ddfb;p=ctsim.git

diff --git a/libctsupport/clip.cpp b/libctsupport/clip.cpp
index 4aa6f01..f99c20f 100644
--- a/libctsupport/clip.cpp
+++ b/libctsupport/clip.cpp
@@ -14,7 +14,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: clip.cpp,v 1.1 2000/06/19 02:58:08 kevin Exp $
+**  $Id: clip.cpp,v 1.4 2000/07/23 01:49:03 kevin Exp $
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -30,8 +30,7 @@
 **  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ******************************************************************************/
 
-#include "kstddef.h"
-#include "kmath.h"
+#include "ctsupport.h"
 
 
 /* NAME
@@ -152,8 +151,8 @@ clip_circle (double& x1, double& y1, double& x2, double& y2, const double cx, co
   xform_mtx2 (rotmtx, ccx, ccy);
   t1 += theta;			// rotate start and stop angles 
   t2 += theta;
-  t1 = norm_ang (t1);
-  t2 = norm_ang (t2);
+  t1 = normalizeAngle (t1);
+  t2 = normalizeAngle (t2);
 
   if (xc2 < -D_EPSILON || fabs(yc2) > F_EPSILON) {
     sys_error (ERR_SEVERE, "Internal error in clip_circle\n x1=%6.2f, y1=%6.2f, x2=%6.2f, y2=%6.2f, xc2=%6.2f, yc2=%6.2f, theta=%6.2f", x1, y1, x2, y2, xc2, yc2, theta);
@@ -252,8 +251,7 @@ clip_triangle (double& x1, double& y1, double& x2, double& y2, const double u, c
   int c2 = tcode (x2, y2, m, b, clip_xaxis);
 
 #ifdef DEBUG
-  crt_set_cpos (1,1);
-  printf ("x1:%6.2f  y1:%6.2f  code1:%2d  x2:%6.2f  y2:%6.2f code2:%2d",
+  printf ("x1:%6.2f  y1:%6.2f  code1:%2d  x2:%6.2f  y2:%6.2f code2:%2d\n",
 	   x1, y1, c1, x2, y2, c2);
 #endif
   while ( c1 || c2 ) {
@@ -295,8 +293,7 @@ clip_triangle (double& x1, double& y1, double& x2, double& y2, const double u, c
       x2=x; y2=y; c2=tcode (x2,y2,m,b,clip_xaxis);
     }
 #ifdef DEBUG
-    crt_set_cpos (1,1);
-    printf ("x1:%6.2f  y1:%6.2f  code1:%2d  x2:%6.2f  y2:%6.2f code2:%2d", x1, y1, c1, x2, y2, c2);
+    printf ("x1:%6.2f  y1:%6.2f  code1:%2d  x2:%6.2f  y2:%6.2f code2:%2d\n", x1, y1, c1, x2, y2, c2);
 #endif
   }