[Jrman-commit] drafts/src/org/jrman/primitive CubicCurve.java, 1.4, 1.5 LinearCurve.java, 1.4, 1.5

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

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

Modified Files:
	CubicCurve.java LinearCurve.java 
Log Message:
Fixed 'v' and periodic bug in curves.


Index: CubicCurve.java
===================================================================
RCS file: /cvsroot/jrman/drafts/src/org/jrman/primitive/CubicCurve.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CubicCurve.java	30 Dec 2006 13:49:21 -0000	1.4
--- CubicCurve.java	30 Dec 2006 14:59:49 -0000	1.5
***************
*** 72,76 ****
              w = 1f;
          Parameter param = parameters.getParameter("v");
!         if (param == null) {
              float[] v = new float[2];
              v[0] = 0f;
--- 72,76 ----
              w = 1f;
          Parameter param = parameters.getParameter("v");
!         if (param == null && !periodic) {
              float[] v = new float[2];
              v[0] = 0f;
***************
*** 182,185 ****
--- 182,192 ----
              this.parameters = parameters;
              this.attributes = attributes;
+             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));
+             }
              if (apply)
                  applyBasis();

Index: LinearCurve.java
===================================================================
RCS file: /cvsroot/jrman/drafts/src/org/jrman/primitive/LinearCurve.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** LinearCurve.java	30 Dec 2006 13:49:22 -0000	1.4
--- LinearCurve.java	30 Dec 2006 14:59:49 -0000	1.5
***************
*** 68,72 ****
              w = 1f;
          Parameter param = parameters.getParameter("v");
!         if (param == null) {
              float[] v = new float[2];
              v[0] = 0f;
--- 68,72 ----
              w = 1f;
          Parameter param = parameters.getParameter("v");
!         if (param == null && !periodic) {
              float[] v = new float[2];
              v[0] = 0f;
***************
*** 144,147 ****
--- 144,154 ----
              this.parameters = parameters;
              this.attributes = attributes;
+             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));
+             }
          }