[Jrman-commit] drafts/src/org/jrman/primitive CubicCurve.java, 1.3, 1.4 LinearCurve.java, 1.3, 1.4 Primitive.java, 1.39, 1.40

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

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

Modified Files:
	CubicCurve.java LinearCurve.java Primitive.java 
Log Message:
Fixed "v" bug in curves (linear and cubic).
Improved hair shader.


Index: CubicCurve.java
===================================================================
RCS file: /cvsroot/jrman/drafts/src/org/jrman/primitive/CubicCurve.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CubicCurve.java	29 Dec 2006 19:45:30 -0000	1.3
--- CubicCurve.java	30 Dec 2006 13:49:21 -0000	1.4
***************
*** 34,37 ****
--- 34,38 ----
  import org.jrman.grid.Vector3fGrid;
  import org.jrman.parameters.Declaration;
+ import org.jrman.parameters.Parameter;
  import org.jrman.parameters.ParameterList;
  import org.jrman.parameters.VaryingScalarFloat;
***************
*** 70,73 ****
--- 71,81 ----
          else
              w = 1f;
+         Parameter param = parameters.getParameter("v");
+         if (param == null) {
+             float[] v = new float[2];
+             v[0] = 0f;
+             v[1] = 1f;
+             parameters.addParameter(new VaryingScalarFloat(V_DECL, v));
+         }
          MutableAttributes attr = new MutableAttributes(attributes);
          attr.setDisplacementBound(attributes.getDisplacementBound() + w / 2f);
***************
*** 441,445 ****
              }
          }
!         
          protected void dice_v(ShaderVariables shaderVariables) {
              FloatGrid g = shaderVariables.v;
--- 449,454 ----
              }
          }
! 
!         /*
          protected void dice_v(ShaderVariables shaderVariables) {
              FloatGrid g = shaderVariables.v;
***************
*** 453,456 ****
--- 462,466 ----
              }
          }
+         */
          
      }

Index: Primitive.java
===================================================================
RCS file: /cvsroot/jrman/drafts/src/org/jrman/primitive/Primitive.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** Primitive.java	24 Dec 2006 05:25:57 -0000	1.39
--- Primitive.java	30 Dec 2006 13:49:22 -0000	1.40
***************
*** 210,214 ****
          VaryingScalarFloat param =
              (VaryingScalarFloat) parameters.getParameter("v");
!         param.bilinearDice(shaderVariables.v);
      }
  
--- 210,217 ----
          VaryingScalarFloat param =
              (VaryingScalarFloat) parameters.getParameter("v");
!         if (param.getCount() == 4)
!             param.bilinearDice(shaderVariables.v);
!         else
!             param.linearDice(shaderVariables.v);
      }
  

Index: LinearCurve.java
===================================================================
RCS file: /cvsroot/jrman/drafts/src/org/jrman/primitive/LinearCurve.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** LinearCurve.java	26 Dec 2006 17:26:19 -0000	1.3
--- LinearCurve.java	30 Dec 2006 13:49:22 -0000	1.4
***************
*** 31,34 ****
--- 31,35 ----
  import org.jrman.grid.Point3fGrid;
  import org.jrman.grid.Vector3fGrid;
+ import org.jrman.parameters.Parameter;
  import org.jrman.parameters.ParameterList;
  import org.jrman.parameters.VaryingScalarFloat;
***************
*** 66,69 ****
--- 67,77 ----
          else
              w = 1f;
+         Parameter param = parameters.getParameter("v");
+         if (param == null) {
+             float[] v = new float[2];
+             v[0] = 0f;
+             v[1] = 1f;
+             parameters.addParameter(new VaryingScalarFloat(V_DECL, v));
+         }
          MutableAttributes attr = new MutableAttributes(attributes);
          attr.setDisplacementBound(attributes.getDisplacementBound() + w / 2f);
***************
*** 265,269 ****
              }
          }
!         
          protected void dice_v(ShaderVariables shaderVariables) {
              FloatGrid g = shaderVariables.v;
--- 273,278 ----
              }
          }
! 
!         /*
          protected void dice_v(ShaderVariables shaderVariables) {
              FloatGrid g = shaderVariables.v;
***************
*** 277,280 ****
--- 286,290 ----
              }
          }
+         */
          
      }