jrman-commit Mailing List for jrMan (Page 12)

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

Update of /cvsroot/jrman/drafts/src/org/jrman/parser
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24756/src/org/jrman/parser

Modified Files:
	Parser.java 
Log Message:
Added NuPatch support.
Currently it works partially, I need to do more tests.


Index: Parser.java
===================================================================
RCS file: /cvsroot/jrman/drafts/src/org/jrman/parser/Parser.java,v
retrieving revision 1.88
retrieving revision 1.89
diff -C2 -d -r1.88 -r1.89
*** Parser.java	16 Apr 2004 03:47:26 -0000	1.88
--- Parser.java	18 Apr 2004 20:04:49 -0000	1.89
***************
*** 72,75 ****
--- 72,76 ----
  import org.jrman.parser.keywords.KeywordParser;
  import org.jrman.primitive.BicubicPatch;
+ import org.jrman.primitive.NuPatch;
  import org.jrman.primitive.BilinearPatch;
  import org.jrman.primitive.Cone;
***************
*** 92,95 ****
--- 93,105 ----
  import org.jrman.util.Constants;
  
+ import org.jrman.parameters.VaryingScalarHPoint;
+ 
+ import javax.vecmath.Point4f;
+ 
+ import java.util.List;
+ import java.util.ArrayList;
+ import java.util.Iterator;
+ 
+ 
  public class Parser {
  
***************
*** 137,140 ****
--- 147,152 ----
  
      private int lastFrame = -1;
+     
+     private static Point4f P = new Point4f();
  
      public static class State {
***************
*** 942,946 ****
          if (!inObject) {
              BicubicPatch patch = new BicubicPatch(parameters, getAttributes());
-             patch.applyBasis();
              renderer.addPrimitive(patch);
          } else {
--- 954,957 ----
***************
*** 951,955 ****
                      BicubicPatch patch =
                          new BicubicPatch(parameters, createAttributes(transform, attributes));
-                     patch.applyBasis();
                      return patch;
                  }
--- 962,965 ----
***************
*** 1079,1082 ****
--- 1089,1103 ----
      }
  
+     private void print(float[] array)
+     {
+         System.out.print("(");
+         
+         for(int i = 0; i < array.length - 1; i ++)
+             System.out.print(array[i] + ", ");
+         
+         System.out.print(array[array.length - 1]);
+         System.out.println(")");
+     } 
+ 
      public void addNuPatch(
          final int nu,
***************
*** 1085,1112 ****
          final float umin,
          final float umax,
!         final int vu,
          final int vorder,
          final float[] vknot,
          final float vmin,
          final float vmax,
!         final ParameterList parameterList) {
          if (inAreaLightSource)
              return;
!         if (!inObject) {
!             //NuPatch patch = new NuPatch(parameters, getAttributes());
!             //renderer.addPrimitive(patch);
!         } else {
!             final Transform transform = currentAttributes.getTransform();
!             currentObjectInstanceList
!                 .addPrimitiveCreator(new ObjectInstanceList.PrimitiveCreator() {
!                 public Primitive create(Attributes attributes) {
!                     //NuPatch patch =
!                     //new NuPatch(parameters, createAttributes(transform, attributes));
!                     //return patch;
!                     return null;
!                 }
!             });
          }
      }
  
      public void addPointsPolygons(
--- 1106,1257 ----
          final float umin,
          final float umax,
!         final int nv,
          final int vorder,
          final float[] vknot,
          final float vmin,
          final float vmax,
!         final ParameterList parameters) {
          if (inAreaLightSource)
              return;
!         
!         float[] points = extractPoints(nu * nv, parameters);
!         
!         float[] ualfa = insert(uknot, uorder, nu);
!         float[] valfa = insert(vknot, vorder, nv);
!         
!         int mu = ualfa.length /nu;
!         int mv = valfa.length /nv;
!         
!         float[] result = new float[mu * mv * 4];
!         
!         for(int i = 0; i < nv; i++)
!         {
!             divide(ualfa, points, nu, i, result, mu);
          }
+         
+         for(int i = 0; i < mu; i++)
+         {
+             divide(valfa, result, nv, i, result, mv);
+         }
+                             
+         for(int i = 0; i < result.length / 4; i++)
+         {
+             int pos = i * 4;
+             result[pos] = result[pos];
+             result[pos + 1] = result[pos + 1];
+             result[pos + 2] = result[pos + 2];
+             result[pos + 3] = result[pos + 3];
+         }
+         
+         parameters.addParameter(new VaryingScalarHPoint
+                                     (new Declaration("Pw", "vertex hpoint"), result));
+         
+         addBicubicPatchMesh(mu, "periodic", mv, "nonperiodic", parameters); 
      }
+     
+     private float[] insert(float[] x, int order, int n)
+     {
+         List l = new ArrayList();
+         float prev = x[0];
+         for(int i = 0; i < x.length; i++)
+         {                            
+             if(x[i] != prev)
+             {
+                 insert(l, prev, order);
+                 prev = x[i];
+                 
+             }
+         }
+         insert(l, prev, order);
+ 
+         float[] y = new float[l.size()];
+         int c = 0;
+         for(Iterator it = l.iterator(); it.hasNext(); c++)
+         {
+             y[c] = ((Float) it.next()).floatValue();
+         }
+         
+         int m = y.length - order;
+         
+         float[] result = new float[m * n];
+              
+         for(int j = 0; j < m; j++)
+         {
+             for(int i = 0; i < n; i++)
+             {         
+                 float alfa = evaluate(x, y, i, j, order, "");
+                 result[(j * n) + i] = alfa;
+             }
+         }
+         return result;
+     }
+ 
+ 
+     private void divide(float[] alfa, float[] points, int n, int offset, 
+                                   float[] result, int m)
+     {
+         int noffset = n * offset * 4;
+         int moffset = m * offset * 4;
+                 
+         for(int j = 0; j < m; j++)
+         {
+             for(int i = 0; i < n; i++)
+             {               
+                 float a = alfa[(j * n) + i];
+                 result[moffset + j * 4] += points[noffset + i * 4] * a;
+                 result[moffset + j * 4 + 1] += points[noffset + i * 4 + 1] * a;
+                 result[moffset + j * 4 + 2] += points[noffset + i * 4+ 2] * a;
+                 result[moffset + j * 4 + 3] += points[noffset + i * 4+ 3] * a;
+             }
+         }
+     }
+ 
+     
+     private float evaluate(float[] x, float[] y, int i, int j, int k, String indent)
+     {
+         if(k == 1)
+             if(x[i] <= y[j] && y[j] < x[i+1])
+                 return 1;
+             else
+                 return 0;
+         
+         float a1 = evaluate(x, y, i, j, k - 1, indent + " ") ;
+         float a2 = evaluate(x, y, i + 1, j, k - 1, indent + " ");
+              
+         return ( a1 != 0 ? ((y[j + k - 1] - x[i]) / (x[i + k - 1] - x[i])) : 0) +
+             (a2 != 0 ? ((x[i + k] - y[j + k - 1]) / (x[i + k] - x[i + 1])) : 0);
+     }
+     
+     private void insert(List l, float x, int order)
+     {
+         Float f = new Float(x);
+         for(int c = 0; c < order ; c++)
+             l.add(f);
+     }
+     
+     private float[] extractPoints(int points, ParameterList parameters) {
+         VaryingScalarTuple3f param3f = (VaryingScalarTuple3f) parameters.getParameter("P");
+         
+         if(param3f != null)
+         {            
+             parameters.removeParameter("P");
+             parameters.addParameter(new VaryingScalarHPoint
+                                     (new Declaration("Pw", "vertex hpoint"), param3f));
+         }
+         VaryingScalarHPoint paramHp = (VaryingScalarHPoint) parameters.getParameter("Pw");
+         parameters.removeParameter("Pw");
+         
+         float[] controlPoints = new float[points * 4];
+         for(int i = 0; i < points; i ++)
+         {
+             paramHp.getValue(i, P);
+             controlPoints[(4 * i)] = P.x;
+             controlPoints[(4 * i) + 1] = P.y;
+             controlPoints[(4 * i) + 2] = P.z;
+             controlPoints[(4 * i) + 3] = P.w;
+         }
+         return controlPoints;
+     }
+ 
  
      public void addPointsPolygons(

2003	Jan	Feb	Mar	Apr (116)	May (220)	Jun (52)	Jul (30)	Aug (35)	Sep (24)	Oct (49)	Nov (44)	Dec (70)
2004	Jan (21)	Feb (30)	Mar (9)	Apr (44)	May (2)	Jun	Jul (10)	Aug (20)	Sep (25)	Oct (12)	Nov (16)	Dec (4)
2005	Jan	Feb	Mar	Apr	May	Jun (4)	Jul (25)	Aug	Sep	Oct	Nov (26)	Dec (10)
2006	Jan (5)	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (33)
2007	Jan (4)	Feb (57)	Mar (17)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

jrman-commit Mailing List for jrMan (Page 12)

jrman-commit — CVS commits