[Fudaa-cvs-commit] fudaa_devel/ebli/src/org/fudaa/ebli/geometrie GrBoite.java,1.5,1.6 GrPolygone.java,1.6,1.7

[<de...@us...>]

Update of /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/geometrie
In directory sc8-pr-cvs1:/tmp/cvs-serv22991/geometrie

Modified Files:
	GrBoite.java GrPolygone.java 
Log Message:
Modification du paquetage graphe pour prendre en compte les modeles


Index: GrBoite.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/geometrie/GrBoite.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** GrBoite.java	25 Nov 2003 10:06:41 -0000	1.5
--- GrBoite.java	11 Dec 2003 12:41:52 -0000	1.6
***************
*** 25,36 ****
      if (o == null)
        o= new GrPoint(p.x, p.y, p.z);
      if (e == null)
        e= new GrPoint(p.x, p.y, p.z);
!     o.x= Math.min(o.x, p.x);
!     o.y= Math.min(o.y, p.y);
!     o.z= Math.min(o.z, p.z);
!     e.x= Math.max(e.x, p.x);
!     e.y= Math.max(e.y, p.y);
!     e.z= Math.max(e.z, p.z);
    }
    public final void ajuste(double x, double y, double z) {
--- 25,40 ----
      if (o == null)
        o= new GrPoint(p.x, p.y, p.z);
+       else{
+         o.x= Math.min(o.x, p.x);
+         o.y= Math.min(o.y, p.y);
+         o.z= Math.min(o.z, p.z);
+       }
      if (e == null)
        e= new GrPoint(p.x, p.y, p.z);
!       else{
!         e.x= Math.max(e.x, p.x);
!         e.y= Math.max(e.y, p.y);
!         e.z= Math.max(e.z, p.z);
!       }
    }
    public final void ajuste(double x, double y, double z) {

Index: GrPolygone.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/geometrie/GrPolygone.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** GrPolygone.java	25 Nov 2003 10:06:42 -0000	1.6
--- GrPolygone.java	11 Dec 2003 12:41:52 -0000	1.7
***************
*** 110,113 ****
--- 110,119 ----
    }
    public final GrPoint centre() {
+     GrPoint r=new GrPoint();
+     centre(r);
+     return r;
+   }
+   
+   public final void centre(GrPoint _p) {
      double x= 0., y= 0., z= 0.;
      double qt= 0.;
***************
*** 121,126 ****
        qt += q;
      }
!     return new GrPoint(x / qt, y / qt, z / qt);
    }
    public boolean estConvexe() {
      int n= nombre();
--- 127,133 ----
        qt += q;
      }
!     _p.setCoordonnees(x / qt, y / qt, z / qt);
    }
+   
    public boolean estConvexe() {
      int n= nombre();