WebSVN – wimsdev – Diff – /trunk/wims/src/Flydraw/objects.c

     if (tikz_file)
       fprintf(tikz_file, "(%i,%i)--(%i,%i)",
        pm->p[i],flip(pm->p[i+1]),pm->p[i+2],flip(pm->p[i+3]));
+  }
   if(tikz_file) fprintf(tikz_file, ";\n");
+}
+/* for geodesics, return data for obj_hypgeods + a point on the arc
+  to be used for filling hyperbolic triangle*/
+int hypgeodaux(double *q, double* res)
+{
+  double r,cx,cy,a1,a2,a3,tmp,
+    nx = -q[0]*q[2]*q[2]+(q[0]*q[0]+q[1]*q[1]+1)*q[2]-q[0]*q[3]*q[3]-q[0],
+    ny = -q[1]*q[2]*q[2]-q[1]*q[3]*q[3]+(q[0]*q[0]+q[1]*q[1]+1)*q[3]-q[1],
+    dy = -2*q[1]*q[2]+2*q[0]*q[3];
+  if (dy*dy*1e4 < nx*nx+ny*ny){
+    res[5]=(q[0]+q[2])/2;
+    res[6]=(q[1]+q[3])/2;
+    return 0;}
+  cx = ny/dy; cy=-nx/dy;
+  a1 = atan2(q[1]-cy, q[0]-cx);
+  a2 = atan2(q[3]-cy, q[2]-cx);
+  a3 = (a1+a2)/2;
+  if (fabs(a2-a1)>M_PI){if(a1<a2) a1+=2*M_PI; else a2+=2*M_PI;};
+  if(a1>a2) {tmp=a1; a1=a2; a2=tmp;}
+  r = sqrt(cx*cx+cy*cy-1);
+  res[0]=cx;
+  res[1]=cy;
+  res[2]=r;
+  res[3]=a1;
+  res[4]=a2;
+  res[5]=cx+r*cos(a3);
+  res[6]=cy+r*sin(a3);
+  return 1;
+}
 /* hyperbolic geodesics from x1,y1 to x2,y2, x3,y3 to x4,y4 in Poincaré disk */
 void obj_hypgeods(objparm *pm)
+{
- int i, *qq = pm->p;
+  int i, *qq=pm->p;
+  double rx,ry,res[7];
- for (i = 0; i < pm->pcnt; i+=4){
+  for (i = 0; i < pm->pcnt; i+=4)
-   double r, *q=pm->pd + i,
+    if (hypgeodaux(pm->pd+i,res)){
+      scale2(res[2],res[2],&rx,&ry);
+      scale(res,qq,1);
-   nx = -q[0]*q[2]*q[2]+(q[0]*q[0]+q[1]*q[1]+1)*q[2]-q[0]*q[3]*q[3]-q[0],
+      myGdImageArc(image,qq[0],qq[1],rx,ry,res[3]/DEG,res[4]/DEG,pm->color[0]);
+    }
+    else {
+      scale(pm->pd+i,qq,2);
-   ny = -q[1]*q[2]*q[2]-q[1]*q[3]*q[3]+(q[0]*q[0]+q[1]*q[1]+1)*q[3]-q[1],
+      gdImageLine(image,qq[0],qq[1],qq[2],qq[3],pm->color[0]);
+    }
+}
+/* hyperbolique triangle, can be filled */
+void obj_hyptriangle(objparm *pm)
+{
-   dy = -2*q[1]*q[2]+2*q[0]*q[3];
+  double rx,ry,data[8],res[7];
+  int i, *qq=pm->p;
+  for(i=0; i<8; i++) data[i]=pm->pd[i%6];
+  for(i=0; i<3; i++)
-   if (dy*dy * 1e8 < nx*nx+ny*ny){
+    if(hypgeodaux(data+2*i,res)) {
+      scale2(res[2],res[2],&rx,&ry);
-     scale(q,qq,2);
+      scale(res,qq,1);
+      myGdImageArc(image,qq[0],qq[1],rx,ry,res[3]/DEG,res[4]/DEG,pm->color[0]);
+    }
+    else {
+      scale(data+2*i,qq,2);
-     gdImageLine(image,qq[0],qq[1],qq[2],qq[3],pm->color[0]);
+      gdImageLine(image,qq[0],qq[1],qq[2],qq[3],pm->color[0]);
+    }
+  if(pm->fill){
+    data[0]=res[5];
+    data[1]=res[6];
+    hypgeodaux(data,res);
+    scale(res+5,qq,1);
+    patchgdImageFill(image,qq[0],qq[1],pm->color[0]);
+  }
+}
+/* hyperbolic geodesic through two points */
+void obj_hypline(objparm *pm)
+{
+  double rx,ry,res[7];
+  if (hypgeodaux(pm->pd,res)){
+      double alpha=atan(1/res[2]), beta = atan2(res[0], res[1]);
+      scale(pm->pd, pm->p, 1);
+      scale2(res[2],res[2],&rx,&ry);
+      myGdImageArc(image, pm->p[0], pm->p[1], rx, ry, 180+(beta-alpha)/DEG, 180+(beta+alpha)/DEG,pm->color[0]);
+  }
+  else {
+    double gamma = atan2(pm->pd[0],pm->pd[1]);
+    res[0]=cos(gamma);
+    res[1]=sin(gamma);
+    res[2]=-cos(gamma);
+    res[3]=-sin(gamma);
+    scale(res,pm->p,2);
+    gdImageLine(image,pm->p[0],pm->p[1],pm->p[2],pm->p[3],pm->color[0]);
+  }
+}
+void obj_hyplines(objparm *pm)
+{
+  double rx,ry,res[7];
+  int i;
+  for (i=0; i < pm->pcnt; i+=4)
+    if (hypgeodaux(pm->pd+i,res)) {
+      double alpha=atan(1/res[2]), beta = atan2(res[0], res[1]);
+      scale(pm->pd+i, pm->p, 1);
+      scale2(res[2],res[2],&rx,&ry);
+      myGdImageArc(image, pm->p[0], pm->p[1], rx, ry, 180+(beta-alpha)/DEG, 180+(beta+alpha)/DEG,pm->color[0]);
-   }
+    }
     else {
-      double rx,ry;
-      double dc[2];int ic[2];
-      double
-        cx = ny/dy, cy=-nx/dy,
-        a1 = atan2(q[1]-cy, q[0]-cx)/DEG,
+      double gamma = atan2(pm->pd[i],pm->pd[i+1]);
-        a2 = atan2(q[3]-cy, q[2]-cx)/DEG;
+      res[0]=cos(gamma);
-      if (fabs(a2-a1)>180){if(a1<a2) a1+=360; else a2+=360;};
-      r = sqrt(cx*cx+cy*cy-1);
+      res[1]=sin(gamma);
-      scale2(r,r,&rx,&ry);
+      res[2]=-cos(gamma);
-      dc[0]=cx;dc[1]=cy;
+      res[3]=-sin(gamma);
-      scale(dc,ic,1);
+      scale(res,pm->p,2);
-      if(a1<a2) myGdImageArc(image,ic[0],ic[1],rx,ry,a1,a2,pm->color[0]);
-      else myGdImageArc(image,ic[0],ic[1],rx,ry,a2,a1,pm->color[0]);
+      gdImageLine(image,pm->p[0],pm->p[1],pm->p[2],pm->p[3],pm->color[0]);
+    }
-  }
+}
 /* segments */
 void obj_dlines(objparm *pm)
+{
  int i, n;
+{
   int i,nb;
   double dt, r=rx>ry?rx:ry;
   t2-=t1;
   t2-=360*floor(t2/360);
-  if(t2<1) t2=360;
+  if(t2==0) t2=360;
   t1*=DEG;t2*=DEG;
   nb = r*t2/3;
   dt = t2/nb;
   for (i=0; i<nb; ++i,t1+=dt)
     gdImageLine(im,cx+rx*cos(t1),cy+ry*sin(t1),

Subversion Repositories wimsdev

(root)/trunk/wims/src/Flydraw/objects.c – Rev 18320 → 18325