[Jrman-commit] drafts/src/org/jrman/parameters UniformScalarTuple3f.java, 1.6, 1.7 VaryingArrayFloat.java, 1.11, 1.12 VaryingArrayHPoint.java, 1.8, 1.9 VaryingArrayTuple3f.java, 1.8, 1.9

[Gerardo H. <ma...@us...>]

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

Modified Files:
	UniformScalarTuple3f.java VaryingArrayFloat.java 
	VaryingArrayHPoint.java VaryingArrayTuple3f.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: UniformScalarTuple3f.java
===================================================================
RCS file: /cvsroot/jrman/drafts/src/org/jrman/parameters/UniformScalarTuple3f.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** UniformScalarTuple3f.java	24 Dec 2006 05:25:56 -0000	1.6
--- UniformScalarTuple3f.java	26 Feb 2007 19:35:47 -0000	1.7
***************
*** 32,36 ****
      final private float z;
  
!     public UniformScalarTuple3f(Declaration declaration, float x, float y, float z) {
          super(declaration);
          this.x = x;
--- 32,37 ----
      final private float z;
  
!     public UniformScalarTuple3f(Declaration declaration,
!                                 float x, float y, float z) {
          super(declaration);
          this.x = x;

Index: VaryingArrayHPoint.java
===================================================================
RCS file: /cvsroot/jrman/drafts/src/org/jrman/parameters/VaryingArrayHPoint.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** VaryingArrayHPoint.java	24 Dec 2006 05:25:56 -0000	1.8
--- VaryingArrayHPoint.java	26 Feb 2007 19:35:47 -0000	1.9
***************
*** 62,97 ****
          float[] newValues = new float[n * 16];
          for (int i = 0; i < off1; i++) {
!             newValues[i] =
!                 Calc.interpolate(
!                     values[i],
!                     values[off1 + i],
!                     values[off2 + i],
!                     values[off3 + i],
!                     uMin,
!                     vMin);
!             newValues[off1 + i] =
!                 Calc.interpolate(
!                     values[i],
!                     values[off1 + i],
!                     values[off2 + i],
!                     values[off3 + i],
!                     uMax,
!                     vMin);
!             newValues[off1 + i] =
!                 Calc.interpolate(
!                     values[i],
!                     values[off1 + i],
!                     values[off2 + i],
!                     values[off3 + i],
!                     uMin,
!                     vMax);
!             newValues[off1 + i] =
!                 Calc.interpolate(
!                     values[i],
!                     values[off1 + i],
!                     values[off2 + i],
!                     values[off3 + i],
!                     uMax,
!                     vMax);
          }
          return new VaryingArrayHPoint(declaration, newValues);
--- 62,89 ----
          float[] newValues = new float[n * 16];
          for (int i = 0; i < off1; i++) {
!             newValues[i] = Calc.interpolate(values[i],
!                                             values[off1 + i],
!                                             values[off2 + i],
!                                             values[off3 + i],
!                                             uMin,
!                                             vMin);
!             newValues[off1 + i] = Calc.interpolate(values[i],
!                                                    values[off1 + i],
!                                                    values[off2 + i],
!                                                    values[off3 + i],
!                                                    uMax,
!                                                    vMin);
!             newValues[off1 + i] = Calc.interpolate(values[i],
!                                                    values[off1 + i],
!                                                    values[off2 + i],
!                                                    values[off3 + i],
!                                                    uMin,
!                                                    vMax);
!             newValues[off1 + i] = Calc.interpolate(values[i],
!                                                    values[off1 + i],
!                                                    values[off2 + i],
!                                                    values[off3 + i],
!                                                    uMax,
!                                                    vMax);
          }
          return new VaryingArrayHPoint(declaration, newValues);

Index: VaryingArrayTuple3f.java
===================================================================
RCS file: /cvsroot/jrman/drafts/src/org/jrman/parameters/VaryingArrayTuple3f.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** VaryingArrayTuple3f.java	24 Dec 2006 05:25:56 -0000	1.8
--- VaryingArrayTuple3f.java	26 Feb 2007 19:35:47 -0000	1.9
***************
*** 61,96 ****
          float[] newValues = new float[n * 12];
          for (int i = 0; i < off1; i++) {
!             newValues[i] =
!                 Calc.interpolate(
!                     values[i],
!                     values[off1 + i],
!                     values[off2 + i],
!                     values[off3 + i],
!                     uMin,
!                     vMin);
!             newValues[off1 + i] =
!                 Calc.interpolate(
!                     values[i],
!                     values[off1 + i],
!                     values[off2 + i],
!                     values[off3 + i],
!                     uMax,
!                     vMin);
!             newValues[off1 + i] =
!                 Calc.interpolate(
!                     values[i],
!                     values[off1 + i],
!                     values[off2 + i],
!                     values[off3 + i],
!                     uMin,
!                     vMax);
!             newValues[off1 + i] =
!                 Calc.interpolate(
!                     values[i],
!                     values[off1 + i],
!                     values[off2 + i],
!                     values[off3 + i],
!                     uMax,
!                     vMax);
          }
          return new VaryingArrayTuple3f(declaration, newValues);
--- 61,88 ----
          float[] newValues = new float[n * 12];
          for (int i = 0; i < off1; i++) {
!             newValues[i] = Calc.interpolate(values[i],
!                                             values[off1 + i],
!                                             values[off2 + i],
!                                             values[off3 + i],
!                                             uMin,
!                                             vMin);
!             newValues[off1 + i] = Calc.interpolate(values[i],
!                                                    values[off1 + i],
!                                                    values[off2 + i],
!                                                    values[off3 + i],
!                                                    uMax,
!                                                    vMin);
!             newValues[off1 + i] = Calc.interpolate(values[i],
!                                                    values[off1 + i],
!                                                    values[off2 + i],
!                                                    values[off3 + i],
!                                                    uMin,
!                                                    vMax);
!             newValues[off1 + i] = Calc.interpolate(values[i],
!                                                    values[off1 + i],
!                                                    values[off2 + i],
!                                                    values[off3 + i],
!                                                    uMax,
!                                                    vMax);
          }
          return new VaryingArrayTuple3f(declaration, newValues);

Index: VaryingArrayFloat.java
===================================================================
RCS file: /cvsroot/jrman/drafts/src/org/jrman/parameters/VaryingArrayFloat.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** VaryingArrayFloat.java	24 Dec 2006 05:25:56 -0000	1.11
--- VaryingArrayFloat.java	26 Feb 2007 19:35:47 -0000	1.12
***************
*** 57,92 ****
          float[] newValues = new float[4 * n];
          for (int i = 0; i < n; i++) {
!             newValues[i] =
!                 Calc.interpolate(
!                     values[i],
!                     values[n + i],
!                     values[n2 + i],
!                     values[n3 + i],
!                     uMin,
!                     vMin);
!             newValues[n + i] =
!                 Calc.interpolate(
!                     values[i],
!                     values[n + i],
!                     values[n2 + i],
!                     values[n3 + i],
!                     uMax,
!                     vMin);
!             newValues[n2 + i] =
!                 Calc.interpolate(
!                     values[i],
!                     values[n + i],
!                     values[n2 + i],
!                     values[n3 + i],
!                     uMin,
!                     vMax);
!             newValues[n3 + i] =
!                 Calc.interpolate(
!                     values[i],
!                     values[n + i],
!                     values[n2 + i],
!                     values[n3 + i],
!                     uMax,
!                     vMax);
          }
          return new VaryingArrayFloat(declaration, newValues);
--- 57,84 ----
          float[] newValues = new float[4 * n];
          for (int i = 0; i < n; i++) {
!             newValues[i] = Calc.interpolate(values[i],
!                                             values[n + i],
!                                             values[n2 + i],
!                                             values[n3 + i],
!                                             uMin,
!                                             vMin);
!             newValues[n + i] = Calc.interpolate(values[i],
!                                                 values[n + i],
!                                                 values[n2 + i],
!                                                 values[n3 + i],
!                                                 uMax,
!                                                 vMin);
!             newValues[n2 + i] = Calc.interpolate(values[i],
!                                                  values[n + i],
!                                                  values[n2 + i],
!                                                  values[n3 + i],
!                                                  uMin,
!                                                  vMax);
!             newValues[n3 + i] = Calc.interpolate(values[i],
!                                                  values[n + i],
!                                                  values[n2 + i],
!                                                  values[n3 + i],
!                                                  uMax,
!                                                  vMax);
          }
          return new VaryingArrayFloat(declaration, newValues);