[Jrman-commit] drafts/src/org/jrman/attributes Attributes.java, 1.8, 1.9 Basis.java, 1.2, 1.3 Detai

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/jrman/drafts/src/org/jrman/attributes
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv30698/src/org/jrman/attributes

Modified Files:
	Attributes.java Basis.java DetailRange.java 
	GeometricApproximation.java MutableAttributes.java 
	Orientation.java ShadingInterpolation.java SolidOperation.java 
	Space.java TextureCoordinates.java TrimCurveSense.java 
Log Message:
Check for Catmull Clark scheme before trying to instance a Subdivision Mesh.
Started reformatting source code to fit in 80 columns, remove tabs and ugly
formatting done by Eclipse.

Index: Basis.java
===================================================================
RCS file: /cvsroot/jrman/drafts/src/org/jrman/attributes/Basis.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Basis.java	9 Feb 2004 16:49:31 -0000	1.2
--- Basis.java	26 Feb 2007 19:35:46 -0000	1.3
***************
*** 1,19 ****
  /*
!  Basis.java
!  Copyright (C) 2003, 2004 Gerardo Horvilleur Martinez
! 
!  This program is free software; you can redistribute it and/or
!  modify it under the terms of the GNU General Public License
!  as published by the Free Software Foundation; either version 2
!  of the License, or (at your option) any later version.
! 
!  This program is distributed in the hope that it will be useful,
!  but WITHOUT ANY WARRANTY; without even the implied warranty of
!  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
!  GNU General Public License for more details.

!  You should have received a copy of the GNU General Public License
!  along with this program; if not, write to the Free Software
!  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */

--- 1,19 ----
  /*
!   Basis.java
!   Copyright (C) 2003, 2004 Gerardo Horvilleur Martinez
!   
!   This program is free software; you can redistribute it and/or
!   modify it under the terms of the GNU General Public License
!   as published by the Free Software Foundation; either version 2
!   of the License, or (at your option) any later version.
!   
!   This program is distributed in the hope that it will be useful,
!   but WITHOUT ANY WARRANTY; without even the implied warranty of
!   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
!   GNU General Public License for more details.

!   You should have received a copy of the GNU General Public License
!   along with this program; if not, write to the Free Software
!   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */

***************
*** 30,89 ****

      static {
!         bezierInverse = 
!             new Matrix4f(-1f, 3f, -3f, 1, 3f, -6f, 3f, 0f, -3f, 3f, 0f, 0f, 1f, 0f, 0f, 0f);
          bezierInverse.invert();
      }

      public final static Basis BEZIER =
!         new Basis(
!             new Matrix4f(-1f, 3f, -3f, 1, 3f, -6f, 3f, 0f, -3f, 3f, 0f, 0f, 1f, 0f, 0f, 0f));

      public final static Basis B_SPLINE =
!         new Basis(
!             new Matrix4f(
!                 -1f / 6f,
!                 3f / 6f,
!                 -3f / 6f,
!                 1f / 6f,
!                 3f / 6f,
!                 -6f / 6f,
!                 0f / 6f,
!                 4f / 6f,
!                 -3f / 6f,
!                 3f / 6f,
!                 3f / 6f,
!                 1f / 6f,
!                 1f / 6f,
!                 0f / 6f,
!                 0f / 6f,
!                 0f / 6f));

      public final static Basis CATMULL_ROM =
!         new Basis(
!             new Matrix4f(
!                 -1f / 2f,
!                 2f / 2f,
!                 -1f / 2f,
!                 0f / 2f,
!                 3f / 2f,
!                 -5f / 2f,
!                 0f / 2f,
!                 2f / 2f,
!                 -3f / 2f,
!                 4f / 2f,
!                 1f / 2f,
!                 0f / 2f,
!                 1f / 2f,
!                 -1f / 2f,
!                 0f / 2f,
!                 0f / 2f));

      public final static Basis HERMITE =
!         new Basis(
!             new Matrix4f(2f, -3f, 0f, 1f, 1f, -2f, 1f, 0f, -2f, 3f, 0f, 0f, 1f, -1f, 0f, 0f));

      public final static Basis POWER =
!         new Basis(
!             new Matrix4f(1f, 0f, 0f, 0f, 0f, 1f, 0f, 0f, 0f, 0f, 1f, 0f, 0f, 0f, 0f, 1f));

      private static final Map map = new HashMap();
--- 30,69 ----

      static {
!         bezierInverse = new Matrix4f(-1f, 3f, -3f, 1f,
!                                      3f, -6f, 3f, 0f,
!                                      -3f, 3f, 0f, 0f,
!                                      1f, 0f, 0f, 0f);
          bezierInverse.invert();
      }

      public final static Basis BEZIER =
!         new Basis(new Matrix4f(-1f, 3f, -3f, 1,
!                                3f, -6f, 3f, 0f,
!                                -3f, 3f, 0f, 0f,
!                                1f, 0f, 0f, 0f));

      public final static Basis B_SPLINE =
!         new Basis(new Matrix4f(-1f / 6f, 3f / 6f, -3f / 6f, 1f / 6f,
!                                3f / 6f,  -6f / 6f, 0f / 6f, 4f / 6f,
!                                -3f / 6f, 3f / 6f, 3f / 6f,  1f / 6f,
!                                1f / 6f, 0f / 6f, 0f / 6f, 0f / 6f));

      public final static Basis CATMULL_ROM =
!         new Basis(new Matrix4f(-1f / 2f, 2f / 2f, -1f / 2f, 0f / 2f,
!                                3f / 2f, -5f / 2f, 0f / 2f, 2f / 2f,
!                                -3f / 2f, 4f / 2f, 1f / 2f, 0f / 2f,
!                                1f / 2f, -1f / 2f, 0f / 2f, 0f / 2f));

      public final static Basis HERMITE =
!         new Basis(new Matrix4f(2f, -3f, 0f, 1f,
!                                1f, -2f, 1f, 0f,
!                                -2f, 3f, 0f, 0f,
!                                1f, -1f, 0f, 0f));

      public final static Basis POWER =
!         new Basis(new Matrix4f(1f, 0f, 0f, 0f,
!                                0f, 1f, 0f, 0f,
!                                0f, 0f, 1f, 0f,
!                                0f, 0f, 0f, 1f));

      private static final Map map = new HashMap();

Index: TrimCurveSense.java
===================================================================
RCS file: /cvsroot/jrman/drafts/src/org/jrman/attributes/TrimCurveSense.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TrimCurveSense.java	9 Apr 2003 05:04:57 -0000	1.1
--- TrimCurveSense.java	26 Feb 2007 19:35:46 -0000	1.2
***************
*** 1,19 ****
  /*
!  TrimCurveSense.java
!  Copyright (C) 2003 Gerardo Horvilleur Martinez
! 
!  This program is free software; you can redistribute it and/or
!  modify it under the terms of the GNU General Public License
!  as published by the Free Software Foundation; either version 2
!  of the License, or (at your option) any later version.
! 
!  This program is distributed in the hope that it will be useful,
!  but WITHOUT ANY WARRANTY; without even the implied warranty of
!  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
!  GNU General Public License for more details.
! 
!  You should have received a copy of the GNU General Public License
!  along with this program; if not, write to the Free Software
!  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */

--- 1,19 ----
  /*
!   TrimCurveSense.java
!   Copyright (C) 2003 Gerardo Horvilleur Martinez
!   
!   This program is free software; you can redistribute it and/or
!   modify it under the terms of the GNU General Public License
!   as published by the Free Software Foundation; either version 2
!   of the License, or (at your option) any later version.
!   
!   This program is distributed in the hope that it will be useful,
!   but WITHOUT ANY WARRANTY; without even the implied warranty of
!   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
!   GNU General Public License for more details.
!   
!   You should have received a copy of the GNU General Public License
!   along with this program; if not, write to the Free Software
!   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */

Index: MutableAttributes.java
===================================================================
RCS file: /cvsroot/jrman/drafts/src/org/jrman/attributes/MutableAttributes.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** MutableAttributes.java	30 Dec 2006 16:32:23 -0000	1.10
--- MutableAttributes.java	26 Feb 2007 19:35:46 -0000	1.11
***************
*** 1,19 ****
  /*
!  MutableAttributes.java
!  Copyright (C) 2003, 2006 Gerardo Horvilleur Martinez
! 
!  This program is free software; you can redistribute it and/or
!  modify it under the terms of the GNU General Public License
!  as published by the Free Software Foundation; either version 2
!  of the License, or (at your option) any later version.
! 
!  This program is distributed in the hope that it will be useful,
!  but WITHOUT ANY WARRANTY; without even the implied warranty of
!  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
!  GNU General Public License for more details.
! 
!  You should have received a copy of the GNU General Public License
!  along with this program; if not, write to the Free Software
!  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */

--- 1,19 ----
  /*
!   MutableAttributes.java
!   Copyright (C) 2003, 2006 Gerardo Horvilleur Martinez
!   
!   This program is free software; you can redistribute it and/or
!   modify it under the terms of the GNU General Public License
!   as published by the Free Software Foundation; either version 2
!   of the License, or (at your option) any later version.
!   
!   This program is distributed in the hope that it will be useful,
!   but WITHOUT ANY WARRANTY; without even the implied warranty of
!   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
!   GNU General Public License for more details.
!   
!   You should have received a copy of the GNU General Public License
!   along with this program; if not, write to the Free Software
!   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */

***************
*** 52,56 ****
          detail = Bounds3f.ALL;
          geometricApproximation =
!             new GeometricApproximation(GeometricApproximation.Type.FLATNESS, 1f);
          orientation = Orientation.OUTSIDE;
          sides = 2;
--- 52,56 ----
          detail = Bounds3f.ALL;
          geometricApproximation =
!            new GeometricApproximation(GeometricApproximation.Type.FLATNESS, 1f);
          orientation = Orientation.OUTSIDE;
          sides = 2;
***************
*** 130,134 ****
      }

!     public void setShadingInterpolation(ShadingInterpolation shadingInterpolation) {
          this.shadingInterpolation = shadingInterpolation;
          modified = true;
--- 130,135 ----
      }

!     public void setShadingInterpolation(
!                                     ShadingInterpolation shadingInterpolation) {
          this.shadingInterpolation = shadingInterpolation;
          modified = true;
***************
*** 155,159 ****
      }

!     public void setGeometricApproximation(GeometricApproximation geometricApproximation) {
          this.geometricApproximation = geometricApproximation;
          modified = true;
--- 156,161 ----
      }

!     public void setGeometricApproximation(
!                                GeometricApproximation geometricApproximation) {
          this.geometricApproximation = geometricApproximation;
          modified = true;
***************
*** 180,185 ****
      }

!     public void setDisplacementBoundCoordinateSystem(String displacementBoundCoordinateSystem) {
!         this.displacementBoundCoordinateSystem = displacementBoundCoordinateSystem;
          modified = true;
      }
--- 182,189 ----
      }

!     public void setDisplacementBoundCoordinateSystem(
!                                     String displacementBoundCoordinateSystem) {
!         this.displacementBoundCoordinateSystem =
!             displacementBoundCoordinateSystem;
          modified = true;
      }

Index: DetailRange.java
===================================================================
RCS file: /cvsroot/jrman/drafts/src/org/jrman/attributes/DetailRange.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DetailRange.java	9 Apr 2003 05:04:57 -0000	1.1
--- DetailRange.java	26 Feb 2007 19:35:46 -0000	1.2
***************
*** 1,19 ****
  /*
!  DetailRange.java
!  Copyright (C) 2003 Gerardo Horvilleur Martinez
! 
!  This program is free software; you can redistribute it and/or
!  modify it under the terms of the GNU General Public License
!  as published by the Free Software Foundation; either version 2
!  of the License, or (at your option) any later version.
! 
!  This program is distributed in the hope that it will be useful,
!  but WITHOUT ANY WARRANTY; without even the implied warranty of
!  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
!  GNU General Public License for more details.

!  You should have received a copy of the GNU General Public License
!  along with this program; if not, write to the Free Software
!  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */

--- 1,19 ----
  /*
!   DetailRange.java
!   Copyright (C) 2003 Gerardo Horvilleur Martinez
!   
!   This program is free software; you can redistribute it and/or
!   modify it under the terms of the GNU General Public License
!   as published by the Free Software Foundation; either version 2
!   of the License, or (at your option) any later version.

!   This program is distributed in the hope that it will be useful,
!   but WITHOUT ANY WARRANTY; without even the implied warranty of
!   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
!   GNU General Public License for more details.
!   
!   You should have received a copy of the GNU General Public License
!   along with this program; if not, write to the Free Software
!   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */

***************
*** 34,42 ****
      }

!     public DetailRange(
!         float minVisible,
!         float lowerTransition,
!         float upperTransition,
!         float maxVisible) {
          this.minVisible = minVisible;
          this.lowerTransition = lowerTransition;
--- 34,41 ----
      }

!     public DetailRange(float minVisible,
!                        float lowerTransition,
!                        float upperTransition,
!                        float maxVisible) {
          this.minVisible = minVisible;
          this.lowerTransition = lowerTransition;

Index: SolidOperation.java
===================================================================
RCS file: /cvsroot/jrman/drafts/src/org/jrman/attributes/SolidOperation.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SolidOperation.java	9 Apr 2003 05:04:57 -0000	1.1
--- SolidOperation.java	26 Feb 2007 19:35:46 -0000	1.2
***************
*** 1,19 ****
  /*
!  SolidOperation.java
!  Copyright (C) 2003 Gerardo Horvilleur Martinez
! 
!  This program is free software; you can redistribute it and/or
!  modify it under the terms of the GNU General Public License
!  as published by the Free Software Foundation; either version 2
!  of the License, or (at your option) any later version.
! 
!  This program is distributed in the hope that it will be useful,
!  but WITHOUT ANY WARRANTY; without even the implied warranty of
!  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
!  GNU General Public License for more details.
! 
!  You should have received a copy of the GNU General Public License
!  along with this program; if not, write to the Free Software
!  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */

--- 1,19 ----
  /*
!   SolidOperation.java
!   Copyright (C) 2003 Gerardo Horvilleur Martinez
!   
!   This program is free software; you can redistribute it and/or
!   modify it under the terms of the GNU General Public License
!   as published by the Free Software Foundation; either version 2
!   of the License, or (at your option) any later version.
!   
!   This program is distributed in the hope that it will be useful,
!   but WITHOUT ANY WARRANTY; without even the implied warranty of
!   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
!   GNU General Public License for more details.
!   
!   You should have received a copy of the GNU General Public License
!   along with this program; if not, write to the Free Software
!   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */

***************
*** 25,35 ****
  public class SolidOperation {

!     public final static SolidOperation PRIMITIVE = new SolidOperation("primitive");

!     public final static SolidOperation INTERSECTION = new SolidOperation("intersection");

!     public final static SolidOperation UNION = new SolidOperation("union");

!     public final static SolidOperation DIFFERENCE = new SolidOperation("difference");

      private static Map map = new HashMap();
--- 25,39 ----
  public class SolidOperation {

!     public final static SolidOperation PRIMITIVE =
!         new SolidOperation("primitive");

!     public final static SolidOperation INTERSECTION =
!         new SolidOperation("intersection");

!     public final static SolidOperation UNION =
!         new SolidOperation("union");

!     public final static SolidOperation DIFFERENCE =
!         new SolidOperation("difference");

      private static Map map = new HashMap();
***************
*** 51,55 ****
          SolidOperation result = (SolidOperation) map.get(name);
          if (result == null)
!             throw new IllegalArgumentException("No such solid operation: " + name);
          return result;
      }
--- 55,60 ----
          SolidOperation result = (SolidOperation) map.get(name);
          if (result == null)
!             throw new IllegalArgumentException("No such solid operation: " +
!                                                name);
          return result;
      }

Index: Space.java
===================================================================
RCS file: /cvsroot/jrman/drafts/src/org/jrman/attributes/Space.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Space.java	15 May 2003 03:15:30 -0000	1.1
--- Space.java	26 Feb 2007 19:35:46 -0000	1.2
***************
*** 1,19 ****
  /*
!  Space.java
!  Copyright (C) 2003 Gerardo Horvilleur Martinez
! 
!  This program is free software; you can redistribute it and/or
!  modify it under the terms of the GNU General Public License
!  as published by the Free Software Foundation; either version 2
!  of the License, or (at your option) any later version.
! 
!  This program is distributed in the hope that it will be useful,
!  but WITHOUT ANY WARRANTY; without even the implied warranty of
!  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
!  GNU General Public License for more details.
! 
!  You should have received a copy of the GNU General Public License
!  along with this program; if not, write to the Free Software
!  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */

--- 1,19 ----
  /*
!   Space.java
!   Copyright (C) 2003 Gerardo Horvilleur Martinez
!   
!   This program is free software; you can redistribute it and/or
!   modify it under the terms of the GNU General Public License
!   as published by the Free Software Foundation; either version 2
!   of the License, or (at your option) any later version.
!   
!   This program is distributed in the hope that it will be useful,
!   but WITHOUT ANY WARRANTY; without even the implied warranty of
!   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
!   GNU General Public License for more details.
!   
!   You should have received a copy of the GNU General Public License
!   along with this program; if not, write to the Free Software
!   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */

Index: Attributes.java
===================================================================
RCS file: /cvsroot/jrman/drafts/src/org/jrman/attributes/Attributes.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Attributes.java	24 Dec 2006 05:25:56 -0000	1.8
--- Attributes.java	26 Feb 2007 19:35:46 -0000	1.9
***************
*** 1,19 ****
  /*
!  Attributes.java
!  Copyright (C) 2003, 2006 Gerardo Horvilleur Martinez
! 
!  This program is free software; you can redistribute it and/or
!  modify it under the terms of the GNU General Public License
!  as published by the Free Software Foundation; either version 2
!  of the License, or (at your option) any later version.
! 
!  This program is distributed in the hope that it will be useful,
!  but WITHOUT ANY WARRANTY; without even the implied warranty of
!  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
!  GNU General Public License for more details.
! 
!  You should have received a copy of the GNU General Public License
!  along with this program; if not, write to the Free Software
!  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */

--- 1,19 ----
  /*
!   Attributes.java
!   Copyright (C) 2003, 2006 Gerardo Horvilleur Martinez
!   
!   This program is free software; you can redistribute it and/or
!   modify it under the terms of the GNU General Public License
!   as published by the Free Software Foundation; either version 2
!   of the License, or (at your option) any later version.
!   
!   This program is distributed in the hope that it will be useful,
!   but WITHOUT ANY WARRANTY; without even the implied warranty of
!   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
!   GNU General Public License for more details.
!   
!   You should have received a copy of the GNU General Public License
!   along with this program; if not, write to the Free Software
!   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */

***************
*** 119,123 ****
          transform = other.getTransform();
          displacementBound = other.getDisplacementBound();
!         displacementBoundCoordinateSystem = other.getDisplacementBoundCoordinateSystem();
          objectIdentifier = other.getObjectIdentifier();
          trimCurveSense = other.getTrimCurveSense();
--- 119,124 ----
          transform = other.getTransform();
          displacementBound = other.getDisplacementBound();
!         displacementBoundCoordinateSystem =
!             other.getDisplacementBoundCoordinateSystem();
          objectIdentifier = other.getObjectIdentifier();
          trimCurveSense = other.getTrimCurveSense();

Index: GeometricApproximation.java
===================================================================
RCS file: /cvsroot/jrman/drafts/src/org/jrman/attributes/GeometricApproximation.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GeometricApproximation.java	9 Apr 2003 05:04:57 -0000	1.1
--- GeometricApproximation.java	26 Feb 2007 19:35:46 -0000	1.2
***************
*** 1,19 ****
  /*
!  GeometricApproximation.java
!  Copyright (C) 2003 Gerardo Horvilleur Martinez
! 
!  This program is free software; you can redistribute it and/or
!  modify it under the terms of the GNU General Public License
!  as published by the Free Software Foundation; either version 2
!  of the License, or (at your option) any later version.
! 
!  This program is distributed in the hope that it will be useful,
!  but WITHOUT ANY WARRANTY; without even the implied warranty of
!  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
!  GNU General Public License for more details.
! 
!  You should have received a copy of the GNU General Public License
!  along with this program; if not, write to the Free Software
!  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */

--- 1,19 ----
  /*
!   GeometricApproximation.java
!   Copyright (C) 2003 Gerardo Horvilleur Martinez
!   
!   This program is free software; you can redistribute it and/or
!   modify it under the terms of the GNU General Public License
!   as published by the Free Software Foundation; either version 2
!   of the License, or (at your option) any later version.
!   
!   This program is distributed in the hope that it will be useful,
!   but WITHOUT ANY WARRANTY; without even the implied warranty of
!   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
!   GNU General Public License for more details.
!   
!   You should have received a copy of the GNU General Public License
!   along with this program; if not, write to the Free Software
!   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */

***************
*** 50,54 ****
                  (GeometricApproximation.Type) Type.map.get(name);
              if (result == null)
!                 throw new IllegalArgumentException("No such approximation type: " + name);
              return result;
          }
--- 50,55 ----
                  (GeometricApproximation.Type) Type.map.get(name);
              if (result == null)
!               throw new IllegalArgumentException("No such approximation type: "
!                                                  + name);
              return result;
          }
***************
*** 60,64 ****
      }

!     public GeometricApproximation(GeometricApproximation.Type type, float value) {
          this.type = type;
          this.value = value;
--- 61,66 ----
      }

!     public GeometricApproximation(GeometricApproximation.Type type,
!                                   float value) {
          this.type = type;
          this.value = value;

Index: TextureCoordinates.java
===================================================================
RCS file: /cvsroot/jrman/drafts/src/org/jrman/attributes/TextureCoordinates.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TextureCoordinates.java	9 Apr 2003 05:04:57 -0000	1.1
--- TextureCoordinates.java	26 Feb 2007 19:35:46 -0000	1.2
***************
*** 1,19 ****
  /*
!  TextureCoordinates.java
!  Copyright (C) 2003 Gerardo Horvilleur Martinez
! 
!  This program is free software; you can redistribute it and/or
!  modify it under the terms of the GNU General Public License
!  as published by the Free Software Foundation; either version 2
!  of the License, or (at your option) any later version.
! 
!  This program is distributed in the hope that it will be useful,
!  but WITHOUT ANY WARRANTY; without even the implied warranty of
!  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
!  GNU General Public License for more details.
! 
!  You should have received a copy of the GNU General Public License
!  along with this program; if not, write to the Free Software
!  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */

--- 1,19 ----
  /*
!   TextureCoordinates.java
!   Copyright (C) 2003 Gerardo Horvilleur Martinez
!   
!   This program is free software; you can redistribute it and/or
!   modify it under the terms of the GNU General Public License
!   as published by the Free Software Foundation; either version 2
!   of the License, or (at your option) any later version.
!   
!   This program is distributed in the hope that it will be useful,
!   but WITHOUT ANY WARRANTY; without even the implied warranty of
!   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
!   GNU General Public License for more details.
!   
!   You should have received a copy of the GNU General Public License
!   along with this program; if not, write to the Free Software
!   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */

***************
*** 38,50 ****
      private float t4;

!     public TextureCoordinates(
!         float s1,
!         float t1,
!         float s2,
!         float t2,
!         float s3,
!         float t3,
!         float s4,
!         float t4) {
          this.s1 = s1;
          this.t1 = t1;
--- 38,49 ----
      private float t4;

!     public TextureCoordinates(float s1,
!                               float t1,
!                               float s2,
!                               float t2,
!                               float s3,
!                               float t3,
!                               float s4,
!                               float t4) {
          this.s1 = s1;
          this.t1 = t1;

Index: Orientation.java
===================================================================
RCS file: /cvsroot/jrman/drafts/src/org/jrman/attributes/Orientation.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Orientation.java	9 Apr 2003 05:04:57 -0000	1.1
--- Orientation.java	26 Feb 2007 19:35:46 -0000	1.2
***************
*** 1,19 ****
  /*
!  Orientation.java
!  Copyright (C) 2003 Gerardo Horvilleur Martinez
! 
!  This program is free software; you can redistribute it and/or
!  modify it under the terms of the GNU General Public License
!  as published by the Free Software Foundation; either version 2
!  of the License, or (at your option) any later version.
! 
!  This program is distributed in the hope that it will be useful,
!  but WITHOUT ANY WARRANTY; without even the implied warranty of
!  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
!  GNU General Public License for more details.
! 
!  You should have received a copy of the GNU General Public License
!  along with this program; if not, write to the Free Software
!  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */

--- 1,19 ----
  /*
!   Orientation.java
!   Copyright (C) 2003 Gerardo Horvilleur Martinez
!   
!   This program is free software; you can redistribute it and/or
!   modify it under the terms of the GNU General Public License
!   as published by the Free Software Foundation; either version 2
!   of the License, or (at your option) any later version.
!   
!   This program is distributed in the hope that it will be useful,
!   but WITHOUT ANY WARRANTY; without even the implied warranty of
!   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
!   GNU General Public License for more details.
!   
!   You should have received a copy of the GNU General Public License
!   along with this program; if not, write to the Free Software
!   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */

Index: ShadingInterpolation.java
===================================================================
RCS file: /cvsroot/jrman/drafts/src/org/jrman/attributes/ShadingInterpolation.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ShadingInterpolation.java	9 Apr 2003 05:04:57 -0000	1.1
--- ShadingInterpolation.java	26 Feb 2007 19:35:46 -0000	1.2
***************
*** 1,19 ****
  /*
!  ShadingInterpolation.java
!  Copyright (C) 2003 Gerardo Horvilleur Martinez
! 
!  This program is free software; you can redistribute it and/or
!  modify it under the terms of the GNU General Public License
!  as published by the Free Software Foundation; either version 2
!  of the License, or (at your option) any later version.
! 
!  This program is distributed in the hope that it will be useful,
!  but WITHOUT ANY WARRANTY; without even the implied warranty of
!  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
!  GNU General Public License for more details.
! 
!  You should have received a copy of the GNU General Public License
!  along with this program; if not, write to the Free Software
!  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */

--- 1,19 ----
  /*
!   ShadingInterpolation.java
!   Copyright (C) 2003 Gerardo Horvilleur Martinez
!   
!   This program is free software; you can redistribute it and/or
!   modify it under the terms of the GNU General Public License
!   as published by the Free Software Foundation; either version 2
!   of the License, or (at your option) any later version.
!   
!   This program is distributed in the hope that it will be useful,
!   but WITHOUT ANY WARRANTY; without even the implied warranty of
!   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
!   GNU General Public License for more details.
!   
!   You should have received a copy of the GNU General Public License
!   along with this program; if not, write to the Free Software
!   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */

***************
*** 28,32 ****
          new ShadingInterpolation("constant");

!     public static final ShadingInterpolation SMOOTH = new ShadingInterpolation("smooth");

      private final static Map map = new HashMap();
--- 28,33 ----
          new ShadingInterpolation("constant");

!     public static final ShadingInterpolation SMOOTH =
!         new ShadingInterpolation("smooth");

      private final static Map map = new HashMap();
***************
*** 44,50 ****

      public static ShadingInterpolation getNamed(String name) {
!         ShadingInterpolation result = (ShadingInterpolation) ShadingInterpolation.map.get(name);
          if (result == null)
!             throw new IllegalArgumentException("No such shading interpolation: " + name);
          return result;
      }
--- 45,53 ----

      public static ShadingInterpolation getNamed(String name) {
!         ShadingInterpolation result = (ShadingInterpolation)
!             ShadingInterpolation.map.get(name);
          if (result == null)
!            throw new IllegalArgumentException("No such shading interpolation: "
!                                               + name);
          return result;
      }