jrman-commit Mailing List for jrMan (Page 8)

Status: Alpha

Brought to you by: edivargas, egarduno, magoghm

jrman-commit — CVS commits

You can subscribe to this list here.

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

Flat | Threaded

<< < 1 .. 6 7 8 9 10 .. 41 > >> (Page 8 of 41)

[Jrman-commit] drafts/src/org/jrman/render SimpleMicropolygon.java,1.21,1.22 SmoothMicropolygon.java,1.2,1.3

From: Gerardo H. <ma...@us...> - 2005-07-02 08:01:09

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

Modified Files:
	SimpleMicropolygon.java SmoothMicropolygon.java 
Log Message:
Another micropolygon sampling optimization.

Index: SimpleMicropolygon.java
===================================================================
RCS file: /cvsroot/jrman/drafts/src/org/jrman/render/SimpleMicropolygon.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** SimpleMicropolygon.java	2 Jul 2005 07:52:13 -0000	1.21
--- SimpleMicropolygon.java	2 Jul 2005 08:00:35 -0000	1.22
***************
*** 153,159 ****
              return;
          float v = oy * bx - ox * by;
!         if (v < 0f || u + v > 1f)
              return;
!         float z = (1f - u - v) * az + u * bz + v * cz;
          sp.addSample(
              colorRed,
--- 153,162 ----
              return;
          float v = oy * bx - ox * by;
!         if (v < 0f)
              return;
!         float w = 1f - u - v;
!         if (w < 0f)
!             return;
!         float z = w * az + u * bz + v * cz;
          sp.addSample(
              colorRed,

Index: SmoothMicropolygon.java
===================================================================
RCS file: /cvsroot/jrman/drafts/src/org/jrman/render/SmoothMicropolygon.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SmoothMicropolygon.java	2 Jul 2005 07:52:15 -0000	1.2
--- SmoothMicropolygon.java	2 Jul 2005 08:00:35 -0000	1.3
***************
*** 201,207 ****
              return;
          float v = oy * bx - ox * by;
!         if (v < 0f || u + v > 1f)
              return;
          float w = 1f - u - v;
          float z = w * az + u * bz + v * cz;
          float colorRed = w * aColorRed + u * bColorRed + v * cColorRed;
--- 201,209 ----
              return;
          float v = oy * bx - ox * by;
!         if (v < 0f)
              return;
          float w = 1f - u - v;
+         if (w < 0)
+             return;
          float z = w * az + u * bz + v * cz;
          float colorRed = w * aColorRed + u * bColorRed + v * cColorRed;

[Jrman-commit] drafts/src/org/jrman/render SimpleMicropolygon.java,1.20,1.21 SmoothMicropolygon.java,1.1,1.2

From: Gerardo H. <ma...@us...> - 2005-07-02 07:52:30

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

Modified Files:
	SimpleMicropolygon.java SmoothMicropolygon.java 
Log Message:
Micropolygon sampling optimization!

Index: SimpleMicropolygon.java
===================================================================
RCS file: /cvsroot/jrman/drafts/src/org/jrman/render/SimpleMicropolygon.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** SimpleMicropolygon.java	8 Feb 2004 08:54:55 -0000	1.20
--- SimpleMicropolygon.java	2 Jul 2005 07:52:13 -0000	1.21
***************
*** 47,52 ****
      private float cz;
  
-     private float oneOverDet;
- 
      private float colorRed;
  
--- 47,50 ----
***************
*** 90,94 ****
          if (det > -EPSILON && det < EPSILON)
              return false;
!         oneOverDet = 1f / det;
          colorRed = cRed;
          colorGreen = cGreen;
--- 88,95 ----
          if (det > -EPSILON && det < EPSILON)
              return false;
!         bx /= det;
!         by /= det;
!         cx /= det;
!         cy /= det;
          colorRed = cRed;
          colorGreen = cGreen;
***************
*** 148,155 ****
          float ox = point.x - ax;
          float oy = point.y - ay;
!         float u = (ox * cy - oy * cx) * oneOverDet;
          if (u < 0f || u > 1f)
              return;
!         float v = (oy * bx - ox * by) * oneOverDet;
          if (v < 0f || u + v > 1f)
              return;
--- 149,156 ----
          float ox = point.x - ax;
          float oy = point.y - ay;
!         float u = ox * cy - oy * cx;
          if (u < 0f || u > 1f)
              return;
!         float v = oy * bx - ox * by;
          if (v < 0f || u + v > 1f)
              return;

Index: SmoothMicropolygon.java
===================================================================
RCS file: /cvsroot/jrman/drafts/src/org/jrman/render/SmoothMicropolygon.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SmoothMicropolygon.java	8 Feb 2004 08:54:55 -0000	1.1
--- SmoothMicropolygon.java	2 Jul 2005 07:52:15 -0000	1.2
***************
*** 47,52 ****
      private float cz;
  
-     private float oneOverDet;
- 
      private float aColorRed;
  
--- 47,50 ----
***************
*** 126,130 ****
          if (det > -EPSILON && det < EPSILON)
              return false;
!         oneOverDet = 1f / det;
          aColorRed = acRed;
          aColorGreen = acGreen;
--- 124,131 ----
          if (det > -EPSILON && det < EPSILON)
              return false;
!         bx /= det;
!         by /= det;
!         cx /= det;
!         cy /= det;
          aColorRed = acRed;
          aColorGreen = acGreen;
***************
*** 196,203 ****
          float ox = point.x - ax;
          float oy = point.y - ay;
!         float u = (ox * cy - oy * cx) * oneOverDet;
          if (u < 0f || u > 1f)
              return;
!         float v = (oy * bx - ox * by) * oneOverDet;
          if (v < 0f || u + v > 1f)
              return;
--- 197,204 ----
          float ox = point.x - ax;
          float oy = point.y - ay;
!         float u = ox * cy - oy * cx;
          if (u < 0f || u > 1f)
              return;
!         float v = oy * bx - ox * by;
          if (v < 0f || u + v > 1f)
              return;

[Jrman-commit] drafts/src/org/jrman/primitive Nurbs.java,1.9,1.10

From: Gerardo H. <ma...@us...> - 2005-06-27 05:24:00

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

Modified Files:
	Nurbs.java 
Log Message:
Added C preprocessor source files.

Index: Nurbs.java
===================================================================
RCS file: /cvsroot/jrman/drafts/src/org/jrman/primitive/Nurbs.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Nurbs.java	20 Dec 2004 03:22:51 -0000	1.9
--- Nurbs.java	27 Jun 2005 05:23:49 -0000	1.10
***************
*** 663,667 ****
          if (u == kv[m + 1]) /* Special case for closed interval */
              return m;
- 
          int i = m + k;
          while ((u < kv[i]) && (i > 0))
--- 663,666 ----

[Jrman-commit] drafts/src/org/jrman/compiler/preprocessor TokenList.java,NONE,1.1 Tokenizer.java,NONE,1.1 Token.java,NONE,1.1 UnexpectedEndOfFileException.java,NONE,1.1

From: Gerardo H. <ma...@us...> - 2005-06-27 05:23:59

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

Added Files:
	TokenList.java Tokenizer.java Token.java 
	UnexpectedEndOfFileException.java 
Log Message:
Added C preprocessor source files.

--- NEW FILE: TokenList.java ---
/*
TokenList.java
Copyright (C) 2005 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.
*/

package org.jrman.compiler.preprocessor;

import java.util.LinkedList;
import java.util.ListIterator;

class TokenList {
    
    private LinkedList tokens = new LinkedList();
    
    void addToken(Token token) {
        tokens.addLast(token);
    }
    
    boolean hasMoreTokens() {
        return !tokens.isEmpty();
    }
    
    Token nextToken() {
        Token token = (Token) tokens.getFirst();
        tokens.removeFirst();
        return token;
    }
    
    void pushBack(Token token) {
        tokens.addFirst(token);
    }
    
    void pushBack(TokenList tl) {
        ListIterator iter = tl.tokens.listIterator(tokens.size());
        while (iter.hasPrevious())
            pushBack((Token) iter.previous());
    }

}

--- NEW FILE: Token.java ---
/*
Token.java
Copyright (C) 2005 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.
*/

package org.jrman.compiler.preprocessor;

class Token {
    
    final static Token SPACE = new Token(Type.SPACE, " ");
    
    final static Token NEW_LINE = new Token(Type.NEW_LINE, "\n");
    
    final private Type type;
    
    final private String image;
    
    Token(Type type, String image) {
        this.type = type;
        this.image = image;
    }
    
    Token(Type type, char image) {
        this(type, "" + image);
    }
    
    Type getType() {
        return type;
    }
    
    String getImage() {
        return image;
    }
    
    public String toString() {
        return type.toString() + ": " + image;
    }
    
    static class Type {
        
        final static Type IDENTIFIER = new Type("IDENTIFIER");
        
        final static Type OPERATOR = new Type("OPERATOR");
        
        final static Type NUMBER_LITERAL = new Type("NUMBER");
        
        final static Type STRING_LITERAL = new Type("STRING_LITERAL");
        
        final static Type ANGLES_STRING_LITERAL =
            new Type("ANGLES_STRING_LITERAL");
        
        final static Type SPACE = new Type("SPACE");
        
        final static Type NEW_LINE = new Type("NEW_LINE");
        
        final private String name;
        
        private Type(String name) {
            this.name = name;
        }
        
        public String toString() {
            return name;
        }
    }

}

--- NEW FILE: Tokenizer.java ---
/*
Tokenizer.java
Copyright (C) 2005 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.
*/

package org.jrman.compiler.preprocessor;

import java.io.IOException;
import java.io.Reader;

public class Tokenizer {
    
    private final static int STATE_DEFAULT = 1;
    
    private final static int STATE_AFTER_SHARP = 2;
    
    private final static int STATE_AFTER_INCLUDE = 3;
    
    private Reader reader;
    
    private int state;
    
    private int ch;
    
    private int[] pushback = new int[16];
    
    private int pushbackLast = 0;
    
    private boolean insideStringLiteral = false;
    
    Tokenizer(Reader reader) throws IOException {
        this.reader = reader;
        state = STATE_DEFAULT;
        ch = getNextChar();
    }
    
    TokenList getTokens() throws IOException {
        TokenList tl = new TokenList();
        Token token;
        while ((token = getNextToken()) != null)
            tl.addToken(token);
        if (token != Token.NEW_LINE)
            tl.addToken(Token.NEW_LINE);
        return tl;
    }
    
    private int readChar() throws IOException {
        if (pushbackLast > 0)
            return pushback[pushbackLast--];
        return reader.read();
    }
    
    private void pushbackChar(int ch) {
        if (pushbackLast == pushback.length - 1) {
            int[] tmp = new int[pushback.length * 2];
            System.arraycopy(pushback, 0, tmp, 0, pushback.length);
            pushback = tmp;
        }
        pushback[++pushbackLast] = ch;
    }
     private int getNextCharNewLines() throws IOException {
         int ch = readChar();
         if (ch == '\r') {
             ch = readChar();
             if (ch != '\n')
                 pushbackChar(ch);
             return '\n';
         }
         return ch;
     }
     
     private int getNextChar() throws IOException {
         int ch = getNextCharNewLines();
         if (insideStringLiteral || ch != '\\')
             return ch;
         ch = getNextCharNewLines();
         if (ch == '\n')
             return getNextChar();
         if (!isSpace(ch)) {
             pushbackChar(ch);
             return '\\';
         }
         while (isSpace(ch))
             ch = getNextCharNewLines();
         if (ch == '\n')
             return getNextChar();
         pushbackChar(ch);
         pushbackChar(' ');
         return '\\';
     }
    
    private Token getNextToken() throws IOException {
        if (ch == -1)
            return null;
        if (ch == '\n')
            return Token.NEW_LINE;
        if (isSpace(ch)) {
            while (isSpace(ch))
                ch = getNextChar();
            return Token.SPACE;
        }
        if (ch == '/') {
            ch = getNextChar();
            if (ch != '*' && ch != '/')
                return new Token(Token.Type.OPERATOR, "/");
            if (ch == '*') {
                while (true) {
                    while ((ch = getNextChar()) != '*')
                        if (ch == -1)
                            throw new UnexpectedEndOfFileException("inside /* comment");
                    ch = getNextChar();
                    if (ch == '/') {
                        ch = getNextChar();
                        return Token.SPACE;
                    }
                }
            } else {
                while ((ch = getNextChar()) != '\n')
                    if (ch == -1)
                        return null;
                ch = getNextChar();
                return Token.SPACE;
            }
        }
        return null;
    }
    
    private boolean isSpace(int ch) {
        return ch == ' ' || ch == '\t';
    }

}

--- NEW FILE: UnexpectedEndOfFileException.java ---
/*
UnexpectedEndOfFileException.java
Copyright (C) 2005 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.
*/

package org.jrman.compiler.preprocessor;

import java.io.IOException;

public class UnexpectedEndOfFileException extends IOException {

    public UnexpectedEndOfFileException(String msg) {
        super(msg);
    }

}

[Jrman-commit] drafts/src/org/jrman/compiler/preprocessor - New directory

From: Gerardo H. <ma...@us...> - 2005-06-27 05:23:51

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

Log Message:
Directory /cvsroot/jrman/drafts/src/org/jrman/compiler/preprocessor added to the repository

[Jrman-commit] drafts/src/org/jrman/compiler - New directory

From: Gerardo H. <ma...@us...> - 2005-06-27 05:23:51

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

Log Message:
Directory /cvsroot/jrman/drafts/src/org/jrman/compiler added to the repository

[Jrman-commit] drafts/src/org/jrman/parser/keywords KeywordPointsPolygons.java,1.6,1.7 KeywordCurves.java,1.2,1.3

From: Gerardo H. <ma...@us...> - 2004-12-20 03:23:33

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

Modified Files:
	KeywordPointsPolygons.java KeywordCurves.java 
Log Message:
Fixed small bug.
Fixed build.xml to not include .java files in jrman.jar!

Index: KeywordPointsPolygons.java
===================================================================
RCS file: /cvsroot/jrman/drafts/src/org/jrman/parser/keywords/KeywordPointsPolygons.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** KeywordPointsPolygons.java	2 Feb 2004 19:30:06 -0000	1.6
--- KeywordPointsPolygons.java	20 Dec 2004 03:22:52 -0000	1.7
***************
*** 42,59 ****
      }
  
- /*
-     public void parse(Tokenizer st) throws Exception {
-         
-         // Expect array nVertices
-         float[] nVertices = readFloatArray(st);
- 
-         // Expect array vertices
-         float[] vertices = readFloatArray(st);
- 
-         // Expect parameter list
-         ParameterList parameterList = parseParameterList(st);
-         parser.addPointsPolygon(nVertices, vertices, parameterList);
-     }
-     */
- 
  }
--- 42,44 ----

Index: KeywordCurves.java
===================================================================
RCS file: /cvsroot/jrman/drafts/src/org/jrman/parser/keywords/KeywordCurves.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** KeywordCurves.java	7 Apr 2003 08:24:28 -0000	1.2
--- KeywordCurves.java	20 Dec 2004 03:22:52 -0000	1.3
***************
*** 1,5 ****
  /*
   KeywordCurves.java
!  Copyright (C) 2003 Gerardo Horvilleur Martinez
  
   This program is free software; you can redistribute it and/or
--- 1,5 ----
  /*
   KeywordCurves.java
!  Copyright (C) 2003, 2004 Gerardo Horvilleur Martinez
  
   This program is free software; you can redistribute it and/or
***************
*** 20,23 ****
--- 20,24 ----
  package org.jrman.parser.keywords;
  
+ import org.jrman.parameters.ParameterList;
  import org.jrman.parser.Tokenizer;
  
***************
*** 27,39 ****
          // Expect type
          match(st, TK_STRING);
! 
          // Expect nvertices
!         parseArray(st);
! 
          // Expect wrap
          match(st, TK_STRING);
! 
          // Expect parameter list
!         parseParameterList(st);
      }
  
--- 28,47 ----
          // Expect type
          match(st, TK_STRING);
!         String type = st.sval;
          // Expect nvertices
!         parseIntegerArray(st);
!         int nVertices[] = new int[arraySize];
!         System.arraycopy(integers, 0, nVertices, 0, arraySize);
          // Expect wrap
          match(st, TK_STRING);
!         String wrap = st.sval;
          // Expect parameter list
!         ParameterList parameters = parseParameterList(st);
!         if (type.equals("linear"))
!             parser.addLinearCurves(nVertices, wrap, parameters);
!         else if (type.equals("cubic"))
!             parser.addCubicCurves(nVertices, wrap, parameters);
!         else
!             throw new IllegalArgumentException("Unknown curves type: " + type);
      }

[Jrman-commit] drafts/src/org/jrman/primitive Point.java,1.5,1.6 Nurbs.java,1.8,1.9

From: Gerardo H. <ma...@us...> - 2004-12-20 03:23:32

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

Modified Files:
	Point.java Nurbs.java 
Log Message:
Fixed small bug.
Fixed build.xml to not include .java files in jrman.jar!

Index: Point.java
===================================================================
RCS file: /cvsroot/jrman/drafts/src/org/jrman/primitive/Point.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Point.java	30 Nov 2003 03:23:16 -0000	1.5
--- Point.java	20 Dec 2004 03:22:50 -0000	1.6
***************
*** 1,4 ****
  /*
!  Cylinder.java
   Copyright (C) 2003 Gerardo Horvilleur Martinez
  
--- 1,4 ----
  /*
!  Points.java
   Copyright (C) 2003 Gerardo Horvilleur Martinez
  

Index: Nurbs.java
===================================================================
RCS file: /cvsroot/jrman/drafts/src/org/jrman/primitive/Nurbs.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Nurbs.java	10 Nov 2004 05:48:01 -0000	1.8
--- Nurbs.java	20 Dec 2004 03:22:51 -0000	1.9
***************
*** 557,561 ****
          float[] aval = new float[k];
          float[][] alpha = new float[k + 1][m + n + 1];
- 
          for (int j = 0; j <= m + n; j++) {
              int brkPoint = findBreakPoint(wkv[j], ukv, m, k);
--- 557,560 ----
***************
*** 570,574 ****
                  else
                      aval[last] = 0.0F;
! 
                  for (int s = last - 1; s >= 0; s--) {
                      i++;
--- 569,573 ----
                  else
                      aval[last] = 0.0F;
!     
                  for (int s = last - 1; s >= 0; s--) {
                      i++;
***************
*** 585,589 ****
                  alpha[last - s][j] = aval[s];
          }
! 
          return alpha;
      }
--- 584,588 ----
                  alpha[last - s][j] = aval[s];
          }
!     
          return alpha;
      }
***************
*** 699,703 ****
          Nurbs[] result = new Nurbs[2];
          if (dirflag) {
!             float mid = (umax - umin) /2;
              result[0] = new Nurbs(nu, uorder, uknot, umin, umax,
                      nv, vorder, vknot, vmin, vmax, dirflag, 
--- 698,702 ----
          Nurbs[] result = new Nurbs[2];
          if (dirflag) {
!             float mid = (umax + umin) /2;
              result[0] = new Nurbs(nu, uorder, uknot, umin, umax,
                      nv, vorder, vknot, vmin, vmax, dirflag, 
***************
*** 707,711 ****
                      nuInterpolateParameters(mid, umax, vmin, vmax), attributes);
          } else {
!             float mid = (vmax - vmin) /2;
              result[0] = new Nurbs(nu, uorder, uknot, umin, umax,
                      nv, vorder, vknot, vmin, vmax, dirflag,
--- 706,710 ----
                      nuInterpolateParameters(mid, umax, vmin, vmax), attributes);
          } else {
!             float mid = (vmax + vmin) /2;
              result[0] = new Nurbs(nu, uorder, uknot, umin, umax,
                      nv, vorder, vknot, vmin, vmax, dirflag,

[Jrman-commit] drafts/src/org/jrman/render RendererHidden.java,1.68,1.69

From: Gerardo H. <ma...@us...> - 2004-12-20 03:23:04

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

Modified Files:
	RendererHidden.java 
Log Message:
Fixed small bug.
Fixed build.xml to not include .java files in jrman.jar!

Index: RendererHidden.java
===================================================================
RCS file: /cvsroot/jrman/drafts/src/org/jrman/render/RendererHidden.java,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -d -r1.68 -r1.69
*** RendererHidden.java	13 Nov 2004 20:07:55 -0000	1.68
--- RendererHidden.java	20 Dec 2004 03:22:52 -0000	1.69
***************
*** 520,523 ****
--- 520,524 ----
              display("points", parser.getPointCount());
              display("nurbs", parser.getNurbsCount());
+             display("curves", parser.getCurveCount());
              System.out.println("Clipped primitives: " + clippedPrimitivesCount);
              System.out.println("Total patches: " + primitivePatchCount);

[Jrman-commit] drafts/src/org/jrman/parser Parser.java,1.101,1.102

From: Gerardo H. <ma...@us...> - 2004-12-20 03:23:04

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

Modified Files:
	Parser.java 
Log Message:
Fixed small bug.
Fixed build.xml to not include .java files in jrman.jar!

Index: Parser.java
===================================================================
RCS file: /cvsroot/jrman/drafts/src/org/jrman/parser/Parser.java,v
retrieving revision 1.101
retrieving revision 1.102
diff -C2 -d -r1.101 -r1.102
*** Parser.java	13 Nov 2004 20:07:56 -0000	1.101
--- Parser.java	20 Dec 2004 03:22:54 -0000	1.102
***************
*** 167,170 ****
--- 167,172 ----
      private int nurbsCount;
      
+     private int curveCount;
+     
      public static class State {
  
***************
*** 1233,1236 ****
--- 1235,1246 ----
          }
      }
+     
+     public void addLinearCurves(int[] nVertices, String wrap, ParameterList parameters) {
+         
+     }
+     
+     public void addCubicCurves(int[] nVertices, String wrap, ParameterList parameters) {
+         
+     }
  
      public void addNuPatch(
***************
*** 1436,1439 ****
--- 1446,1450 ----
          pointCount = 0;
          nurbsCount = 0;
+         curveCount = 0;
      }
  
***************
*** 1475,1478 ****
--- 1486,1493 ----
          return nurbsCount;
      }
+     
+     public int getCurveCount() {
+         return curveCount;
+     }
  
  }

[Jrman-commit] drafts build.properties,1.3,1.4

From: Elmer G. <ega...@us...> - 2004-11-22 05:37:17

Update of /cvsroot/jrman/drafts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13642

Modified Files:
	build.properties 
Log Message:
added four nurbs examples


Index: build.properties
===================================================================
RCS file: /cvsroot/jrman/drafts/build.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** build.properties	13 Dec 2003 18:00:25 -0000	1.3
--- build.properties	22 Nov 2004 05:31:34 -0000	1.4
***************
*** 1 ****
! dist = jrman-0_3
--- 1 ----
! dist = jrman-0_4

[Jrman-commit] drafts/sampleData cactus.rib,NONE,1.1 ice.rib,NONE,1.1 sgicube.rib,NONE,1.1 terminal_frost.rib,NONE,1.1

From: Elmer G. <ega...@us...> - 2004-11-22 05:31:44

Update of /cvsroot/jrman/drafts/sampleData
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13642/sampleData

Added Files:
	cactus.rib ice.rib sgicube.rib terminal_frost.rib 
Log Message:
added four nurbs examples


--- NEW FILE: terminal_frost.rib ---
##RenderMan RIB-Structure 1.0
version 3.03
FrameBegin 1
Display "terminal_frost" "framebuffer" "rgba" 
Format 800 600 -1
Projection "perspective" "fov" [90]
FrameAspectRatio 1.33333
ScreenWindow -0.321757 0.321757 -0.241318 0.241318
Identity
#rh->lh
Scale -1 1 1
#Camera!
Rotate 6.34023 1 0 0
Rotate 166.058 0 1 0
Translate -3.89168 1.95444 -15.2802
PixelSamples 2 2
PixelFilter "gaussian" 2 2
Exposure 1 1
Quantize "rgba" 255 0 255 0.5
[...4135 lines suppressed...]
0 6 0 1
1 6 0 1
1.91874 6 -13.435 1
3 6 2.02248 1
3.99097 6 -5.48959 1
5 6 0 1
6 6 0 1
7 6 0 1
0 7 0 1
1 7 0 1
1.9368 7 -7.22314 1
3 7 2.74479 1
4.07223 7 -9.39008 1
5 7 0 1
6 7 0 1
7 7 0 1]
TransformEnd
AttributeEnd
WorldEnd
FrameEnd

--- NEW FILE: ice.rib ---
##RenderMan RIB-Structure 1.0
version 3.03
FrameBegin 1
Display "ice" "framebuffer" "rgba" 
Format 400 300 -1
Projection "perspective" "fov" [90]
FrameAspectRatio 1.33333
ScreenWindow -0.366667 0.366667 -0.275 0.275
Identity
#rh->lh
Scale -1 1 1
#Camera!
Rotate -27.9383 1 0 0
Rotate 135 0 1 0
Translate -10 -7.5 -10
PixelSamples 1 1
PixelFilter "gaussian" 2 2
Exposure 1 1
Quantize "rgba" 255 0 255 0.5
Declare "minsamples" "integer"
Option "render" "minsamples" [4]
Declare "maxsamples" "integer"
Option "render" "maxsamples" [64]
Declare "max_raylevel" "integer"
Option "render" "max_raylevel" [8]
Declare "minshadowbias" "float"
Option "render" "minshadowbias" [0.01]
Declare "prmanspecular" "integer"
Option "render" "prmanspecular" [1]
Declare "steps" "integer"
Option "radiosity" "steps" [0]
Declare "minpatchsamples" "integer"
Option "radiosity" "minpatchsamples" [2]
Declare "shader" "string"
Option "searchpath" "shader" ["shaders:&"]
Declare "texturememory" "integer"
Option "limits" "texturememory" [10000]
Declare "geommemory" "integer"
Option "limits" "geommemory" [40000]
WorldBegin
#Lights!
TransformBegin
ConcatTransform [
1 0 0 0
0 1 0 0
0 0 1 0
0 0 0 1
]
Declare "shadows" "string"
Attribute "light" "shadows" ["on"]
Declare "intensity" "float"
Declare "lightcolor" "color"
Declare "from" "point"
LightSource "pointlight" 1 "intensity" [1115684864]
"lightcolor" [1 1 1]
"from" [5 4 -5]
Illuminate 1 1
TransformEnd
TransformBegin
ConcatTransform [
1 0 0 0
0 1 0 0
0 0 1 0
0 0 0 1
]
Declare "shadows" "string"
Attribute "light" "shadows" ["off"]
Declare "intensity" "float"
Declare "lightcolor" "color"
Declare "from" "point"
Declare "to" "point"
LightSource "distantlight" 2 "intensity" [1065353216]
"lightcolor" [1 1 1]
"from" [-16 3 20]
"to" [-12 -7 0]
Illuminate 2 1
TransformEnd
Identity
#Action!
Surface "matte" 
Declare "name" "string"
Attribute "identifier" "name" ["Spoon"]
AttributeBegin
TransformBegin
Translate -2.83624 -6.74292 1.16006
Rotate -178.711 1 0 0
Rotate 4.54837 0 1 0
Rotate 179.898 0 0 1
Color 0.917647 0.917647 0.917647
Opacity 1 1 1
Declare "Ka" "float"
Declare "Kd" "float"
Declare "Ks" "float"
Declare "Kr" "float"
Declare "roughness" "float"
Declare "blur" "float"
Declare "specularcolor" "color"
Declare "samples" "float"
Surface "shiny" "Ka" [1]"Kd" [0.5]"Ks" [0.7]"Kr" [0.25]"roughness" [0.05]"blur" [0]"specularcolor" [1 1 1]
"samples" [1]
AttributeBegin
TransformBegin
AttributeBegin
TransformBegin
NuPatch 14 4 [0 0 0 0 0.0909091 0.181818 0.272727 0.363636 0.454545 0.545455 0.636364 0.727273 0.818182 0.909091 1 1 1 1 ] 0 1 11 3 [0 0 0 0.111111 0.222222 0.333333 0.444444 0.555556 0.666667 0.777778 0.888889 1 1 1 ] 0 1 "Pw" [
-0.00483449 -0.0292143 0.66865 1
-0.125218 0.174807 0.97572 1
-0.174945 0.176475 1.519 1
-0.174945 0.175124 3.16519 1
-0.174945 0.177833 4.81865 1
-0.139956 0.167981 6.16503 1
-0.0874725 0.110544 7.20435 1
-0.0495668 0.0143271 8.06426 1
-0.0495566 -0.0788281 9.1406 1
-0.0397644 -0.260396 10.2007 1
-0.300971 -0.466422 11.1342 1
-0.432712 -0.438404 12.0792 1
-0.35806 -0.0584833 12.8384 1
-0.00442826 0.263121 12.9109 1
0.000531809 -0.0274417 0.66865 1
-0.00501293 0.206634 0.97572 1
-0.00322331 0.207253 1.519 1
-0.00322331 0.202615 3.16519 1
-0.00322331 0.205699 4.81865 1
-0.00257864 0.201019 6.16503 1
-0.00161165 0.138905 7.20435 1
-0.000913253 0.0293784 8.06558 1
-0.000913066 -0.0630307 9.1434 1
0.00246347 -0.263617 10.1988 1
0.018383 -0.516581 11.1448 1
0.0180374 -0.555678 12.0973 1
0.0315082 -0.1436 12.8515 1
0.000378705 0.261701 12.9111 1
0.0116811 -0.03098 0.66865 1
0.244731 0.143104 0.97572 1
0.353554 0.145816 1.519 1
0.353554 0.147739 3.16519 1
0.353554 0.150074 4.81865 1
0.282843 0.13507 6.16503 1
0.176777 0.0822935 7.20435 1
0.100172 -0.000665924 8.06294 1
0.100151 -0.0945643 9.13781 1
0.0824571 -0.259262 10.2023 1
0.574144 -0.409315 11.1247 1
0.763066 -0.328714 12.063 1
0.756759 0.0323174 12.8267 1
0.008971 0.264388 12.9109 1
0.0162575 -0.0420285 0.66865 1
0.347243 -0.0552753 0.97572 1
0.5 -0.0460303 1.519 1
0.5 -0.0236208 3.16519 1
0.5 -0.0236208 4.81865 1
0.4 -0.0708624 6.16503 1
0.25 -0.0944833 7.20435 1
0.141664 -0.0944833 8.0547 1
0.141635 -0.193032 9.12034 1
0.110622 -0.289914 10.2069 1
0.91239 -0.137281 11.082 1
1.37251 0.0799875 11.9901 1
1.15082 0.207982 12.774 1
0.0137073 0.270104 12.9104 1
0.0116811 -0.053077 0.66865 1
0.244731 -0.253655 0.97572 1
0.353554 -0.237876 1.519 1
0.353554 -0.19498 3.16519 1
0.353554 -0.197316 4.81865 1
0.282843 -0.276795 6.16503 1
0.176777 -0.27126 7.20435 1
0.100172 -0.188301 8.04646 1
0.100151 -0.2915 9.10287 1
0.0782216 -0.369698 10.2046 1
0.63107 -0.506032 11.1465 1
0.868864 -0.442403 12.1002 1
0.783086 -0.0675399 12.8536 1
0.0104093 0.261476 12.9111 1
0.000632537 -0.0576535 0.66865 1
-0.00275662 -0.335826 0.97572 1
0 -0.317341 1.519 1
0 -0.26596 3.16519 1
0 -0.269263 4.81865 1
0 -0.362095 6.16503 1
0 -0.344483 7.20435 1
0 -0.227161 8.04304 1
0 -0.332286 9.09563 1
0 -0.402746 10.2037 1
0.0204558 -0.597269 11.1627 1
0.0119874 -0.685305 12.1279 1
0.0162215 -0.248414 12.8736 1
0.000319622 0.259303 12.9112 1
-0.010416 -0.053077 0.66865 1
-0.250244 -0.253655 0.97572 1
-0.353554 -0.237876 1.519 1
-0.353554 -0.19498 3.16519 1
-0.353554 -0.197316 4.81865 1
-0.282843 -0.276795 6.16503 1
-0.176777 -0.27126 7.20435 1
-0.100172 -0.188301 8.04646 1
-0.100151 -0.2915 9.10287 1
-0.0782216 -0.369698 10.2046 1
-0.688131 -0.500178 11.1465 1
-0.999309 -0.432032 12.1002 1
-0.77564 -0.0675399 12.8536 1
-0.0105691 0.261476 12.9111 1
-0.0149925 -0.0420285 0.66865 1
-0.352757 -0.0552753 0.97572 1
-0.5 -0.0460303 1.519 1
-0.5 -0.0236208 3.16519 1
-0.5 -0.0236208 4.81865 1
-0.4 -0.0708624 6.16503 1
-0.25 -0.0944833 7.20435 1
-0.141664 -0.0944833 8.0547 1
-0.141635 -0.193032 9.12034 1
-0.110622 -0.289914 10.2069 1
-0.981024 -0.161578 11.0808 1
-1.48868 0.0879131 11.988 1
-1.229 0.233622 12.7725 1
-0.0151456 0.270263 12.9104 1
-0.010416 -0.03098 0.66865 1
-0.250244 0.143104 0.97572 1
-0.353554 0.145816 1.519 1
-0.353554 0.147739 3.16519 1
-0.353554 0.150074 4.81865 1
-0.282843 0.13507 6.16503 1
-0.176777 0.0822935 7.20435 1
-0.100172 -0.000665924 8.06294 1
-0.100151 -0.0945643 9.13781 1
-0.0824571 -0.257125 10.2026 1
-0.612162 -0.415169 11.1247 1
-0.878763 -0.318343 12.063 1
-0.752239 0.0323174 12.8267 1
-0.00929063 0.264388 12.9109 1
0.000524932 -0.0274417 0.66865 1
-0.00516697 0.206634 0.97572 1
-0.00344336 0.207253 1.519 1
-0.00344336 0.202615 3.16519 1
-0.00344336 0.205699 4.81865 1
-0.00275469 0.201019 6.16503 1
-0.00172168 0.138905 7.20435 1
-0.0009756 0.0293784 8.06558 1
-0.000975401 -0.0630307 9.1434 1
0.00241479 -0.263617 10.1988 1
0.023797 -0.516581 11.1448 1
0.0173333 -0.555678 12.0973 1
0.0309361 -0.133229 12.8515 1
0.000371828 0.261701 12.9111 1
0.00609957 -0.0292143 0.66865 1
0.119705 0.174807 0.97572 1
0.174945 0.176475 1.519 1
0.174945 0.175124 3.16519 1
0.174945 0.177833 4.81865 1
0.139956 0.167981 6.16503 1
0.0874725 0.110544 7.20435 1
0.0495668 0.0143271 8.06426 1
0.0495567 -0.0788281 9.1406 1
0.0424116 -0.261464 10.2005 1
0.29875 -0.463055 11.1348 1
0.389847 -0.447552 12.0802 1
0.398746 -0.0557467 12.8391 1
0.00466798 0.263041 12.911 1]
TransformEnd
AttributeEnd
TransformEnd
AttributeEnd
TransformEnd
AttributeEnd
Declare "name" "string"
Attribute "identifier" "name" ["WGlass"]
AttributeBegin
TransformBegin
Translate -6.06889 -4.1 0.263965
Scale 0.4 0.4 0.4
Color 0.996078 0.996078 0.996078
Opacity 0.117647 0.117647 0.117647
Declare "casts_shadows" "string"
Attribute "render" "casts_shadows" ["shade"]
Declare "Ka" "float"
Declare "Kd" "float"
Declare "Ks" "float"
Declare "Kr" "float"
Declare "Kt" "float"
Declare "roughness" "float"
Declare "blur" "float"
Declare "eta" "float"
Declare "specularcolor" "color"
Declare "transmitcolor" "color"
Declare "samples" "float"
Surface "glass" "Ka" [0.2]"Kd" [0]"Ks" [0.5]"Kr" [0.4]"Kt" [1]"roughness" [0.05]"blur" [0]"eta" [1.11]"specularcolor" [1 1 1]
"transmitcolor" [1 1 1]
"samples" [1]
NuPatch 15 4 [0 0 0 0 0.0833333 0.166667 0.25 0.333333 0.416667 0.5 0.583333 0.666667 0.75 0.833333 0.916667 1 1 1 1 ] 0 1 9 3 [0 0 0 0.25 0.25 0.5 0.5 0.75 0.75 1 1 1 ] 0 1 "Pw" [
-6.93889e-17 -7.31965 0 1
4.44268 -7.57309 0 1
4.49991 -6.80493 0 1
0.756659 -6.52517 0 1
0.71033 0.71033 0 1
1.77057 2.06813 0 1
3.85241 3.10828 0 1
5.15145 6.18086 0 1
5.56879 8.4759 0 1
4.91043 7.80214 0 1
4.58514 5.6547 0 1
3.60532 4.05822 0 1
2.57607 2.91379 0 1
1.31265 2.36363 0 1
0 2.3714 0 1
-4.90654e-17 -5.17577 -4.90654e-17 0.707107
3.14145 -5.35498 3.14145 0.707107
3.18192 -4.81181 3.18192 0.707107
0.535039 -4.61399 0.535039 0.707107
0.502279 0.502279 0.502279 0.707107
1.25198 1.46239 1.25198 0.707107
2.72407 2.19789 2.72407 0.707107
3.64263 4.37053 3.64263 0.707107
3.93773 5.99337 3.93773 0.707107
3.4722 5.51695 3.4722 0.707107
3.24218 3.99848 3.24218 0.707107
2.54935 2.86959 2.54935 0.707107
1.82156 2.06036 1.82156 0.707107
0.928184 1.67134 0.928184 0.707107
0 1.67683 0 0.707107
0 -7.31965 -6.93889e-17 1
0 -7.57309 4.44268 1
0 -6.80493 4.49991 1
0 -6.52517 0.756659 1
0 0.71033 0.71033 1
0 2.06813 1.77057 1
0 3.10828 3.85241 1
0 6.18086 5.15145 1
0 8.4759 5.56879 1
0 7.80214 4.91043 1
0 5.6547 4.58514 1
0 4.05822 3.60532 1
0 2.91379 2.57607 1
0 2.36363 1.31265 1
0 2.3714 0 1
4.90654e-17 -5.17577 -4.90654e-17 0.707107
-3.14145 -5.35498 3.14145 0.707107
-3.18192 -4.81181 3.18192 0.707107
-0.535039 -4.61399 0.535039 0.707107
-0.502279 0.502279 0.502279 0.707107
-1.25198 1.46239 1.25198 0.707107
-2.72407 2.19789 2.72407 0.707107
-3.64263 4.37053 3.64263 0.707107
-3.93773 5.99337 3.93773 0.707107
-3.4722 5.51695 3.4722 0.707107
-3.24218 3.99848 3.24218 0.707107
-2.54935 2.86959 2.54935 0.707107
-1.82156 2.06036 1.82156 0.707107
-0.928184 1.67134 0.928184 0.707107
0 1.67683 0 0.707107
6.93889e-17 -7.31965 0 1
-4.44268 -7.57309 0 1
-4.49991 -6.80493 0 1
-0.756659 -6.52517 0 1
-0.71033 0.71033 0 1
-1.77057 2.06813 0 1
-3.85241 3.10828 0 1
-5.15145 6.18086 0 1
-5.56879 8.4759 0 1
-4.91043 7.80214 0 1
-4.58514 5.6547 0 1
-3.60532 4.05822 0 1
-2.57607 2.91379 0 1
-1.31265 2.36363 0 1
0 2.3714 0 1
4.90654e-17 -5.17577 4.90654e-17 0.707107
-3.14145 -5.35498 -3.14145 0.707107
-3.18192 -4.81181 -3.18192 0.707107
-0.535039 -4.61399 -0.535039 0.707107
-0.502279 0.502279 -0.502279 0.707107
-1.25198 1.46239 -1.25198 0.707107
-2.72407 2.19789 -2.72407 0.707107
-3.64263 4.37053 -3.64263 0.707107
-3.93773 5.99337 -3.93773 0.707107
-3.4722 5.51695 -3.4722 0.707107
-3.24218 3.99848 -3.24218 0.707107
-2.54935 2.86959 -2.54935 0.707107
-1.82156 2.06036 -1.82156 0.707107
-0.928184 1.67134 -0.928184 0.707107
0 1.67683 0 0.707107
0 -7.31965 6.93889e-17 1
0 -7.57309 -4.44268 1
0 -6.80493 -4.49991 1
0 -6.52517 -0.756659 1
0 0.71033 -0.71033 1
0 2.06813 -1.77057 1
0 3.10828 -3.85241 1
0 6.18086 -5.15145 1
0 8.4759 -5.56879 1
0 7.80214 -4.91043 1
0 5.6547 -4.58514 1
0 4.05822 -3.60532 1
0 2.91379 -2.57607 1
0 2.36363 -1.31265 1
0 2.3714 0 1
-4.90654e-17 -5.17577 4.90654e-17 0.707107
3.14145 -5.35498 -3.14145 0.707107
3.18192 -4.81181 -3.18192 0.707107
0.535039 -4.61399 -0.535039 0.707107
0.502279 0.502279 -0.502279 0.707107
1.25198 1.46239 -1.25198 0.707107
2.72407 2.19789 -2.72407 0.707107
3.64263 4.37053 -3.64263 0.707107
3.93773 5.99337 -3.93773 0.707107
3.4722 5.51695 -3.4722 0.707107
3.24218 3.99848 -3.24218 0.707107
2.54935 2.86959 -2.54935 0.707107
1.82156 2.06036 -1.82156 0.707107
0.928184 1.67134 -0.928184 0.707107
0 1.67683 0 0.707107
-6.93889e-17 -7.31965 0 1
4.44268 -7.57309 0 1
4.49991 -6.80493 0 1
0.756659 -6.52517 0 1
0.71033 0.71033 0 1
1.77057 2.06813 0 1
3.85241 3.10828 0 1
5.15145 6.18086 0 1
5.56879 8.4759 0 1
4.91043 7.80214 0 1
4.58514 5.6547 0 1
3.60532 4.05822 0 1
2.57607 2.91379 0 1
1.31265 2.36363 0 1
0 2.3714 0 1]
TransformEnd
AttributeEnd
Declare "name" "string"
Attribute "identifier" "name" ["Wine"]
AttributeBegin
TransformBegin
Translate -6.13968 -2.91008 0.294322
Rotate 90 1 0 0
Color 0.705882 0.0235294 0.235294
Opacity 1 1 1
Declare "Ka" "float"
Declare "Kd" "float"
Surface "matte" "Ka" [1]"Kd" [1]
Disk 0 1 360 
TransformEnd
AttributeEnd
Declare "name" "string"
Attribute "identifier" "name" ["Ground"]
AttributeBegin
TransformBegin
Translate -0.673106 -7.61127 0
Scale 128 1 128
Color 0.996078 0.996078 0.996078
Opacity 1 1 1
Declare "Ka" "float"
Declare "Kd" "float"
Declare "Ks" "float"
Declare "Kr" "float"
Declare "roughness" "float"
Declare "specularcolor" "color"
Declare "txtscale" "float"
Declare "darkcolor" "color"
Declare "lightcolor" "color"
Declare "veincolor" "color"
Declare "groovecolor" "color"
Declare "veinfreq" "float"
Declare "sharpness" "float"
Declare "tilesize" "float"
Declare "groovewidth" "float"
Surface "gmarbtile_polish" "Ka" [1]"Kd" [1]"Ks" [0.1]"Kr" [0.2]"roughness" [0.05]"specularcolor" [1 1 1]
"txtscale" [15]"darkcolor" [0.819608 0.701961 0.564706]
"lightcolor" [0.992157 0.886275 0.776471]
"veincolor" [0.376471 0.109804 0]
"groovecolor" [0 0 0]
"veinfreq" [1]"sharpness" [25]"tilesize" [8]"groovewidth" [0]
SolidBegin "primitive"
TransformBegin
Scale 1 1 1
Patch "bilinear" 
"P" [
0.5 0.5 0.5
0.5 0.5 -0.5
0.5 -0.5 0.5
0.5 -0.5 -0.5]
Rotate 90 0 0 1
Patch "bilinear" 
"P" [
0.5 0.5 0.5
0.5 0.5 -0.5
0.5 -0.5 0.5
0.5 -0.5 -0.5]
Rotate 90 0 0 1
Patch "bilinear" 
"P" [
0.5 0.5 0.5
0.5 0.5 -0.5
0.5 -0.5 0.5
0.5 -0.5 -0.5]
Rotate 90 0 0 1
Patch "bilinear" 
"P" [
0.5 0.5 0.5
0.5 0.5 -0.5
0.5 -0.5 0.5
0.5 -0.5 -0.5]
Rotate 90 0 1 0
Patch "bilinear" 
"P" [
0.5 0.5 0.5
0.5 0.5 -0.5
0.5 -0.5 0.5
0.5 -0.5 -0.5]
Rotate 180 0 1 0
Patch "bilinear" 
"P" [
0.5 0.5 0.5
0.5 0.5 -0.5
0.5 -0.5 0.5
0.5 -0.5 -0.5]
TransformEnd
SolidEnd
TransformEnd
AttributeEnd
Declare "name" "string"
Attribute "identifier" "name" ["World"]
AttributeBegin
TransformBegin
Scale 128 128 128
Color 0.67451 0.933333 0.996078
Opacity 1 1 1
Declare "casts_shadows" "string"
Attribute "render" "casts_shadows" ["none"]
Declare "Kd" "float"
Declare "Ka" "float"
Surface "RCClouds" "Kd" [0.8]"Ka" [0.8]
Sphere 1 -1 1 360 
TransformEnd
AttributeEnd
Declare "name" "string"
Attribute "identifier" "name" ["Cup"]
AttributeBegin
TransformBegin
Translate -8.10134 -7.12148 -12.8369
Scale 0.73668 0.5262 0.73668
Color 0.996078 0.996078 0.996078
Opacity 0.117647 0.117647 0.117647
Declare "casts_shadows" "string"
Attribute "render" "casts_shadows" ["shade"]
Declare "Ka" "float"
Declare "Kd" "float"
Declare "Ks" "float"
Declare "Kr" "float"
Declare "Kt" "float"
Declare "roughness" "float"
Declare "blur" "float"
Declare "eta" "float"
Declare "specularcolor" "color"
Declare "transmitcolor" "color"
Declare "samples" "float"
Surface "glass" "Ka" [0.2]"Kd" [0]"Ks" [0.5]"Kr" [0.4]"Kt" [1]"roughness" [0.05]"blur" [0]"eta" [1.11]"specularcolor" [1 1 1]
"transmitcolor" [1 1 1]
"samples" [1]
NuPatch 15 4 [-0.5625 -0.5 -0.4375 -0.375 -0.3125 -0.25 -0.1875 -0.125 -0.0625 0 0.0625 0.125 0.1875 0.25 0.3125 0.375 0.4375 0.5 0.5625 ] -0.375 0.375 10 4 [0 0 0 0 0.142857 0.285714 0.428571 0.571429 0.714286 0.857143 1 1 1 1 ] 0 1 "Pw" [
0 0 0 1
0 0 0 1
0 0 0 1
0 0 0 1
0 0 0 1
0 0 0 1
0 0 0 1
0 0 0 1
0 0 0 1
0 0 0 1
0 0 0 1
0 0 0 1
0 0 0 1
0 0 0 1
0 0 0 1
1.9094 -0.00486541 -1.10239 1
2.20478 -0.00695058 0 1
1.9094 -0.00486541 1.10239 1
1.10239 -0.00695058 1.90939 1
-1.31415e-06 -0.00486541 2.20478 1
-1.10239 -0.00695058 1.90939 1
-1.9094 -0.00486541 1.10239 1
-2.20478 -0.00695058 -1.92748e-07 1
-1.9094 -0.00486541 -1.10239 1
-1.10239 -0.00695058 -1.90939 1
-1.31415e-06 -0.00486541 -2.20478 1
1.10239 -0.00695058 -1.90939 1
1.9094 -0.00486541 -1.10239 1
2.20478 -0.00695058 0 1
1.9094 -0.00486541 1.10239 1
4.30769 0.200288 -2.48705 1
4.97409 0.286126 0 1
4.30769 0.200288 2.48705 1
2.48705 0.286126 4.30769 1
-2.96479e-06 0.200288 4.97409 1
-2.48704 0.286126 4.30769 1
-4.30769 0.200288 2.48705 1
-4.97409 0.286126 -4.34849e-07 1
-4.30769 0.200288 -2.48705 1
-2.48704 0.286126 -4.30769 1
-2.96479e-06 0.200288 -4.97409 1
2.48705 0.286126 -4.30769 1
4.30769 0.200288 -2.48705 1
4.97409 0.286126 0 1
4.30769 0.200288 2.48705 1
5.4294 1.91939 -3.13467 1
6.26933 2.74198 0 1
5.4294 1.91939 3.13467 1
3.13467 2.74198 5.4294 1
-3.73681e-06 1.91939 6.26933 1
-3.13466 2.74198 5.4294 1
-5.4294 1.91939 3.13467 1
-6.26933 2.74198 -5.48082e-07 1
-5.4294 1.91939 -3.13467 1
-3.13466 2.74198 -5.4294 1
-3.73681e-06 1.91939 -6.26933 1
3.13467 2.74198 -5.4294 1
5.4294 1.91939 -3.13467 1
6.26933 2.74198 0 1
5.4294 1.91939 3.13467 1
5.45158 3.64045 -3.14747 1
6.29494 5.20065 0 1
5.45158 3.64045 3.14747 1
3.14747 5.20065 5.45158 1
-3.75208e-06 3.64045 6.29494 1
-3.14746 5.20065 5.45158 1
-5.45158 3.64045 3.14747 1
-6.29494 5.20065 -5.50321e-07 1
-5.45158 3.64045 -3.14747 1
-3.14746 5.20065 -5.45158 1
-3.75208e-06 3.64045 -6.29494 1
3.14747 5.20065 -5.45158 1
5.45158 3.64045 -3.14747 1
6.29494 5.20065 0 1
5.45158 3.64045 3.14747 1
5.18987 3.61578 -2.99638 1
5.99275 5.1654 0 1
5.18987 3.61578 2.99638 1
2.99638 5.1654 5.18987 1
-3.57196e-06 3.61578 5.99275 1
-2.99637 5.1654 5.18987 1
-5.18988 3.61578 2.99638 1
-5.99275 5.1654 -5.23903e-07 1
-5.18988 3.61578 -2.99638 1
-2.99637 5.1654 -5.18987 1
-3.57196e-06 3.61578 -5.99275 1
2.99638 5.1654 -5.18987 1
5.18987 3.61578 -2.99638 1
5.99275 5.1654 0 1
5.18987 3.61578 2.99638 1
5.19576 2.05253 -2.99978 1
5.99955 2.93219 0 1
5.19576 2.05253 2.99978 1
2.99978 2.93219 5.19576 1
-3.57601e-06 2.05253 5.99955 1
-2.99977 2.93219 5.19576 1
-5.19577 2.05253 2.99978 1
-5.99955 2.93219 -5.24497e-07 1
-5.19577 2.05253 -2.99978 1
-2.99977 2.93219 -5.19576 1
-3.57601e-06 2.05253 -5.99955 1
2.99978 2.93219 -5.19576 1
5.19576 2.05253 -2.99978 1
5.99955 2.93219 0 1
5.19576 2.05253 2.99978 1
4.28379 0.361263 -2.47324 1
4.94649 0.51609 0 1
4.28379 0.361263 2.47324 1
2.47324 0.51609 4.28378 1
-2.94834e-06 0.361263 4.94649 1
-2.47324 0.51609 4.28378 1
-4.28379 0.361263 2.47324 1
-4.94649 0.51609 -4.32436e-07 1
-4.28379 0.361263 -2.47324 1
-2.47324 0.51609 -4.28378 1
-2.94834e-06 0.361263 -4.94649 1
2.47324 0.51609 -4.28378 1
4.28379 0.361263 -2.47324 1
4.94649 0.51609 0 1
4.28379 0.361263 2.47324 1
1.91606 0.168472 -1.10624 1
2.21248 0.240674 0 1
1.91606 0.168472 1.10624 1
1.10624 0.240674 1.91606 1
-1.31874e-06 0.168472 2.21248 1
-1.10624 0.240674 1.91606 1
-1.91607 0.168472 1.10624 1
-2.21248 0.240674 -1.93421e-07 1
-1.91607 0.168472 -1.10624 1
-1.10624 0.240674 -1.91606 1
-1.31874e-06 0.168472 -2.21248 1
1.10624 0.240674 -1.91606 1
1.91606 0.168472 -1.10624 1
2.21248 0.240674 0 1
1.91606 0.168472 1.10624 1
0 0.175 0 1
0 0.25 0 1
0 0.175 0 1
0 0.25 0 1
0 0.175 0 1
0 0.25 0 1
0 0.175 0 1
0 0.25 0 1
0 0.175 0 1
0 0.25 0 1
0 0.175 0 1
0 0.25 0 1
0 0.175 0 1
0 0.25 0 1
0 0.175 0 1]
TransformEnd
AttributeEnd
Declare "name" "string"
Attribute "identifier" "name" ["Ice"]
AttributeBegin
TransformBegin
Translate -8.03738 -6.6182 -12.7915
Scale 2.5 2.12571 2.5
AttributeBegin
TransformBegin
Color 0.8 0.74902 0.647059
Opacity 1 1 1
Declare "Ka" "float"
Declare "Kd" "float"
Declare "firstcol" "color"
Declare "seccol" "color"
Declare "Nu" "float"
Surface "RSstripessrf" "Ka" [1]"Kd" [1]"firstcol" [0.294118 0.109804 0.0784314]
"seccol" [0.992157 0.992157 0.937255]
"Nu" [5]
NuPatch 13 4 [0 0 0 0 0.1 0.2 0.3 0.4 0.5 0.6 0.7 0.8 0.9 1 1 1 1 ] 0 1 19 3 [-0.55 -0.5 -0.45 -0.4 -0.35 -0.3 -0.25 -0.2 -0.15 -0.1 -0.05 0 0.05 0.1 0.15 0.2 0.25 0.3 0.35 0.4 0.45 0.5 ] -0.45 0.4 "Pw" [
-0.374206 -0.101559 1.16667 1
-0.374206 -8.97914e-07 1.16667 1
-0.253333 -3.97364e-07 0.666667 1
-0.372855 0.462361 0.506224 1
-0.152 0.93054 0.583958 1
-0.00502081 1.40772 0.648458 1
-0.101333 1.91568 0.680691 1
-0.139821 2.25205 0.597489 1
-0.0506666 2.59223 0.346037 1
-0.0454031 2.65807 -0.11169 1
-0.0253333 2.46015 -0.361463 1
-0.0233034 2.1381 -0.313024 1
-0.00253333 1.94788 -0.145191 1
0.0443338 -0.101559 1.17183 1
0.0443338 -6.9167e-07 1.17183 1
0.03011 -5.88165e-07 0.986778 1
-0.247363 0.434629 0.823212 1
0.018066 0.897188 0.773106 1
0.182896 1.38134 0.746916 1
0.012044 1.89345 0.80679 1
-0.092761 2.25847 0.716641 1
0.006022 2.62754 0.399437 1
-0.0288454 2.69748 -0.112217 1
0.003011 2.4824 -0.384472 1
-0.0154602 2.13769 -0.332907 1
0.0003011 1.9456 -0.147439 1
0.493876 -0.101559 1.13844 1
0.493876 -9.09536e-07 1.13844 1
0.313553 -3.57759e-07 0.60022 1
0.0714849 0.453196 0.610981 1
0.188132 0.937463 0.544695 1
0.249965 1.44089 0.524662 1
0.125421 1.9203 0.654516 1
0.0268068 2.25417 0.636866 1
0.0627106 2.5849 0.334952 1
0.0104114 2.66999 -0.111235 1
0.0313553 2.45553 -0.356687 1
0.0044678 2.13797 -0.319595 1
0.00313553 1.94836 -0.144725 1
0.848528 -0.101559 0.848529 1
0.848528 -5.05762e-07 0.848529 1
0.707107 -4.21469e-07 0.707107 1
0.338095 0.436808 0.798301 1
0.424264 0.926327 0.607853 1
0.453154 1.44531 0.508163 1
0.282843 1.91287 0.696621 1
0.126786 2.25796 0.707277 1
0.141421 2.59669 0.352783 1
0.0442448 2.69276 -0.111246 1
0.0707107 2.46296 -0.36437 1
0.0211309 2.13772 -0.331345 1
0.00707107 1.9476 -0.145475 1
1.11096 -0.101558 0.514149 1
1.11096 -4.00289e-07 0.514149 1
0.653553 -1.70998e-07 0.286887 1
0.412814 0.465618 0.469004 1
0.392132 0.970109 0.359551 1
0.35613 1.49404 0.326298 1
0.261421 1.94206 0.531087 1
0.154805 2.25129 0.583499 1
0.130711 2.55033 0.282682 1
0.0526717 2.65126 -0.110379 1
0.0653553 2.43375 -0.334166 1
0.0258009 2.13815 -0.310689 1
0.00653553 1.95059 -0.142524 1
1.2 -0.101558 0 1
1.2 0 0 1
1 0 0 1
0.751754 0.476153 0.348589 1
0.6 1 0.190034 1
0.469846 1.54426 0.138871 1
0.4 1.96199 0.418075 1
0.281908 2.24885 0.538236 1
0.2 2.51868 0.234823 1
0.094693 2.63523 -0.109576 1
0.1 2.4138 -0.313545 1
0.0469846 2.13831 -0.303136 1
0.01 1.95263 -0.14051 1
1.11524 -0.101558 -0.424012 1
1.11524 3.32128e-07 -0.424012 1
0.613553 1.39208e-07 -0.233553 1
0.525145 0.500671 0.0683464 1
0.368132 1.02433 0.0520309 1
0.248336 1.55556 0.0967105 1
0.245421 1.97821 0.326073 1
0.196929 2.24317 0.432897 1
0.122711 2.49291 0.195862 1
0.0656012 2.6007 -0.109291 1
0.0613553 2.39756 -0.296758 1
0.0328216 2.13867 -0.285558 1
0.00613553 1.95429 -0.13887 1
0.848528 -0.101557 -0.848529 1
0.848528 5.05762e-07 -0.848529 1
0.707107 4.21469e-07 -0.707107 1
0.725046 0.529467 -0.260795 1
0.424264 1.07367 -0.227785 1
0.211309 1.61728 -0.133659 1
0.282843 2.01111 0.139529 1
0.271892 2.23651 0.309177 1
0.141421 2.44067 0.116863 1
0.0896713 2.55887 -0.108229 1
0.0707107 2.36464 -0.26272 1
0.0453154 2.1391 -0.264913 1
0.00707107 1.95766 -0.135545 1
0.431216 -0.101557 -1.08617 1
0.431216 8.49509e-07 -1.08617 1
0.206887 3.57759e-07 -0.60022 1
0.319758 0.534393 -0.317095 1
0.124132 1.06254 -0.164627 1
-0.00543857 1.58215 -0.00252205 1
0.0827548 2.00368 0.181634 1
0.119909 2.23536 0.288015 1
0.0413774 2.45246 0.134694 1
0.0388706 2.55291 -0.108733 1
0.0206887 2.37207 -0.270403 1
0.0199849 2.13917 -0.261381 1
0.00206887 1.9569 -0.136295 1
0 -0.101557 -1.16825 1
0 6.16933e-07 -1.16825 1
0 6.51675e-07 -1.09333 1
0.299153 0.571635 -0.742774 1
0 1.11391 -0.455999 1
-0.18697 1.63295 -0.192139 1
0 2.03793 -0.0126135 1
0.112182 2.22674 0.128008 1
0 2.39806 0.0524333 1
0.0351193 2.49958 -0.107795 1
0 2.33779 -0.234959 1
0.0186971 2.13972 -0.23468 1
0 1.96041 -0.132833 1
-0.381876 -0.101557 -1.10217 1
-0.381876 8.59045e-07 -1.10217 1
-0.22022 3.65706e-07 -0.613553 1
0.00232669 0.545451 -0.443499 1
-0.132132 1.06393 -0.172506 1
-0.208393 1.56486 0.0619778 1
-0.088088 2.00461 0.176382 1
0.000872515 2.2328 0.240501 1
-0.044044 2.45099 0.13247 1
-0.00114511 2.53792 -0.108941 1
-0.022022 2.37114 -0.269444 1
0.000145427 2.13933 -0.253452 1
-0.0022022 1.957 -0.136202 1
-0.794916 -0.101557 -0.91546 1
-0.794916 5.38439e-07 -0.91546 1
-0.76044 4.61205e-07 -0.773773 1
-0.359947 0.568832 -0.710737 1
-0.456264 1.08062 -0.267177 1
-0.489613 1.56044 0.0784993 1
-0.304176 2.01574 0.113268 1
-0.13498 2.22739 0.14005 1
-0.152088 2.43332 0.105742 1
-0.0471537 2.50539 -0.108897 1
-0.076044 2.36 -0.257928 1
-0.0224967 2.13968 -0.23669 1
-0.0076044 1.95814 -0.135077 1
-1.02669 -0.101558 -0.472012 1
-1.02669 3.60738e-07 -0.472012 1
-0.626887 1.6305e-07 -0.273553 1
-0.396416 0.532873 -0.299722 1
-0.376132 1.0285 0.0283955 1
-0.341321 1.50552 0.283457 1
-0.250755 1.98099 0.310316 1
-0.148656 2.23572 0.294545 1
-0.125377 2.4885 0.189189 1
-0.0505749 2.55704 -0.109891 1
-0.0626887 2.39478 -0.293883 1
-0.024776 2.13915 -0.262471 1
-0.00626887 1.95458 -0.138589 1
-1.14346 -0.101558 -0.016 1
-1.14346 9.53672e-09 -0.016 1
-1.04 7.94727e-09 -0.0133333 1
-0.778176 0.525675 -0.21745 1
-0.624 1.00139 0.182156 1
-0.49092 1.45559 0.469793 1
-0.416 1.96292 0.412823 1
-0.291816 2.23738 0.32547 1
-0.208 2.51721 0.232599 1
-0.0980524 2.5684 -0.110674 1
-0.104 2.41287 -0.312587 1
-0.048636 2.13904 -0.267631 1
-0.0104 1.95272 -0.140416 1
-1.0179 -0.101558 0.442944 1
-1.0179 -3.36194e-07 0.442944 1
-0.586887 -1.55103e-07 0.26022 1
-0.512395 0.496946 0.11092 1
-0.352132 0.972888 0.343794 1
-0.231246 1.44238 0.519095 1
-0.234755 1.94392 0.520582 1
-0.192148 2.24404 0.4489 1
-0.117377 2.54739 0.278233 1
-0.0639327 2.60886 -0.111007 1
-0.0586887 2.43189 -0.332249 1
-0.0320247 2.13861 -0.288229 1
-0.00586887 1.95078 -0.142337 1
-0.848528 -0.101559 0.848529 1
-0.848528 -5.05762e-07 0.848529 1
-0.707107 -4.21469e-07 0.707107 1
-0.725046 0.470533 0.412822 1
-0.424264 0.926327 0.607853 1
-0.211309 1.38272 0.741767 1
-0.282843 1.91287 0.696621 1
-0.271892 2.25015 0.562381 1
-0.141421 2.59669 0.352783 1
-0.0896713 2.64731 -0.112027 1
-0.0707107 2.46296 -0.36437 1
-0.0453154 2.13822 -0.307165 1
-0.00707107 1.9476 -0.145475 1
-0.374672 -0.101559 1.16617 1
-0.374672 -8.97193e-07 1.16617 1
-0.246887 -3.97496e-07 0.666887 1
-0.368069 0.462193 0.508146 1
-0.148132 0.930517 0.584088 1
-0.00195456 1.40798 0.647493 1
-0.0987548 1.91567 0.680778 1
-0.138026 2.25209 0.598212 1
-0.0493774 2.59225 0.346073 1
-0.0447998 2.65829 -0.111687 1
-0.0246887 2.46016 -0.361479 1
-0.0230043 2.1381 -0.313145 1
-0.00246887 1.94788 -0.145193 1
0.040936 -0.101559 1.17107 1
0.040936 -6.90791e-07 1.17107 1
0.0232233 -5.88165e-07 0.986778 1
-0.25254 0.434793 0.821335 1
0.013934 0.897188 0.773106 1
0.17966 1.38103 0.748053 1
0.00928932 1.89345 0.80679 1
-0.0947025 2.25843 0.715935 1
0.00464466 2.62754 0.399437 1
-0.0294976 2.69726 -0.112221 1
0.00232233 2.4824 -0.384472 1
-0.0157838 2.13769 -0.33279 1
0.000232233 1.9456 -0.147439 1
0.492646 -0.101559 1.13894 1
0.492646 -9.10258e-07 1.13894 1
0.32 -3.57628e-07 0.6 1
0.0763917 0.453057 0.612574 1
0.192 0.937486 0.544565 1
0.252957 1.4412 0.523497 1
0.128 1.92031 0.654429 1
0.0286469 2.2542 0.637465 1
0.064 2.58487 0.334915 1
0.0110289 2.67018 -0.111231 1
0.032 2.45551 -0.356672 1
0.00477447 2.13797 -0.319695 1
0.0032 1.94836 -0.144723 1]
TransformEnd
AttributeEnd
TransformEnd
AttributeEnd
WorldEnd
FrameEnd

--- NEW FILE: cactus.rib ---
##RenderMan RIB-Structure 1.0
version 3.03
FrameBegin 1
Display "cactus" "framebuffer" "rgba" 
Format 400 300 -1
Projection "perspective" "fov" [90]
FrameAspectRatio 1.33333
ScreenWindow -0.403333 0.403333 -0.3025 0.3025
Identity
#rh->lh
Scale -1 1 1
#Camera!
Rotate -1.47878e-06 0 0 1
Rotate -19.6664 1 0 0
Rotate 165.113 0 1 0
Translate -3.87264 -5.38732 -14.5681
PixelSamples 2 2
PixelFilter "gaussian" 2 2
Exposure 1 1
[...2870 lines suppressed...]
2.05172 -0.47333 -5.02527e-16 1
2.23228 -0.46769 -5.4675e-16 1
2.23292 -0.46465 -5.46907e-16 1
2.48048 0.463 -6.07543e-16 1
2.48018 0.45851 -6.07468e-16 1
2.05022 0.45402 -5.0216e-16 1
2.05074 0.45514 -5.02287e-16 1
1.57431 -1.84217 -3.85595e-16 1
1.21515 -3.16624 -2.97627e-16 1
1.21741 -3.14978 -2.98179e-16 1
0.233568 -3.41656 -5.72077e-17 1
0.235313 -3.41533 -5.7635e-17 1]
TransformEnd
AttributeEnd
TransformEnd
AttributeEnd
TransformEnd
AttributeEnd
WorldEnd
FrameEnd

--- NEW FILE: sgicube.rib ---
##RenderMan RIB-Structure 1.0
version 3.03
FrameBegin 1
Display "sgicube" "framebuffer" "rgba" 
Format 400 300 -1
Projection "perspective" "fov" [90]
FrameAspectRatio 1.33333
ScreenWindow -0.785983 0.785983 -0.589487 0.589487
Identity
#Default Distant Headlight
LightSource "distantlight" 1 
#rh->lh
Scale -1 1 1
#Camera!
Rotate -9.00316e-05 0 0 1
Rotate -29.9999 1 0 0
Rotate 135 0 1 0
Translate -11.0524 -2.37313 -11.5049
PixelSamples 2 2
PixelFilter "gaussian" 2 2
Exposure 1 1
Quantize "rgba" 255 0 255 0.5
Declare "minsamples" "integer"
Option "render" "minsamples" [4]
Declare "maxsamples" "integer"
Option "render" "maxsamples" [64]
Declare "max_raylevel" "integer"
Option "render" "max_raylevel" [4]
Declare "minshadowbias" "float"
Option "render" "minshadowbias" [0.01]
Declare "prmanspecular" "integer"
Option "render" "prmanspecular" [1]
Declare "steps" "integer"
Option "radiosity" "steps" [0]
Declare "minpatchsamples" "integer"
Option "radiosity" "minpatchsamples" [2]
Declare "texturememory" "integer"
Option "limits" "texturememory" [10000]
Declare "geommemory" "integer"
Option "limits" "geommemory" [40000]
WorldBegin
#Lights!
Identity
#Action!
Surface "matte" 
AttributeBegin
TransformBegin
Color 0.862745 0.862745 0.862745
Opacity 1 1 1
Declare "Ka" "float"
Declare "Kd" "float"
Declare "Ks" "float"
Declare "roughness" "float"
Declare "ringscale" "float"
Declare "txtscale" "float"
Declare "lightwood" "color"
Declare "darkwood" "color"
Declare "grainy" "float"
Surface "wood2" "Ka" [1]"Kd" [0.75]"Ks" [0.4]"roughness" [0.1]"ringscale" [15]"txtscale" [1]"lightwood" [0.686275 0.439216 0.247059]
"darkwood" [0.34902 0.219608 0.0784314]
"grainy" [1]
AttributeBegin
TransformBegin
NuPatch 101 4 [0 0 0 0 0.0102041 0.0204082 0.0306122 0.0408163 0.0510204 0.0612245 0.0714286 0.0816327 0.0918367 0.102041 0.112245 0.122449 0.132653 0.142857 0.153061 0.163265 0.173469 0.183673 0.193878 0.204082 0.214286 0.22449 0.234694 0.244898 0.255102 0.265306 0.27551 0.285714 0.295918 0.306122 0.316327 0.326531 0.336735 0.346939 0.357143 0.367347 0.377551 0.387755 0.397959 0.408163 0.418367 0.428571 0.438776 0.44898 0.459184 0.469388 0.479592 0.489796 0.5 0.510204 0.520408 0.530612 0.540816 0.55102 0.561224 0.571429 0.581633 0.591837 0.602041 0.612245 0.622449 0.632653 0.642857 0.653061 0.663265 0.673469 0.683673 0.693878 0.704082 0.714286 0.72449 0.734694 0.744898 0.755102 0.765306 0.77551 0.785714 0.795918 0.806122 0.816327 0.826531 0.836735 0.846939 0.857143 0.867347 0.877551 0.887755 0.897959 0.908163 0.918367 0.928571 0.938776 0.94898 0.959184 0.969388 0.979592 0.989796 1 1 1 1 ] 0 1 9 4 [-0.6 -0.5 -0.4 -0.3 -0.2 -0.1 0 0.1 0.2 0.3 0.4 0.5 0.6 ] -0.3 0.3 "Pw" [
-2.47559e-07 0.69282 4.6 1
2.97918 0.69282 4.57564 1
3.53178 0.69282 4.49787 1
3.58359 0.69282 4.16746 1
3.6 0.69282 2.48026 1
3.6 0.69282 -0.31825 1
3.59903 0.69282 -2.6255 1
3.55247 0.69282 -3.52822 1
3.54734 0.69282 -3.54786 1
2.84322 0.69282 -3.598 1
0.936667 0.69282 -3.6 1
-1.5076 0.69282 -3.6 1
-3.15667 0.684665 -3.6 1
-4.13837 0.470151 -3.6 1
-4.65507 -0.44163 -3.6 1
-4.6928 -1.80716 -3.6 1
-4.69282 -4.39002 -3.6 1
-4.69282 -7.03971 -3.6 1
-4.66328 -8.48394 -3.6 1
-4.20869 -9.42213 -3.6 1
-3.20102 -9.6816 -3.6 1
-1.43369 -9.69282 -3.6 1
1.37181 -9.69282 -3.6 1
3.66165 -9.69166 -3.6 1
4.81367 -9.6074 -3.6 1
5.58927 -8.87868 -3.6 1
5.69101 -7.82948 -3.6 1
5.69282 -5.89107 -3.6 1
5.69282 -3.45051 -3.6 1
5.69282 -1.86104 -3.59181 1
5.69282 -1.44109 -3.54362 1
5.69282 -1.42817 -3.41327 1
5.69282 -1.40001 -2.15517 1
5.69282 -1.4 0.445002 1
5.69282 -1.4 3.07879 1
5.69282 -1.42559 4.38982 1
5.69282 -1.44188 4.54408 1
5.69282 -1.86177 4.59039 1
5.69282 -3.61331 4.6 1
5.69282 -6.42517 4.6 1
5.69282 -8.68391 4.59868 1
5.69282 -9.5377 4.54996 1
5.69282 -9.54995 4.54082 1
5.69282 -9.59847 3.79412 1
5.69282 -9.6 1.84528 1
5.69282 -9.6 -0.591041 1
5.68317 -9.6 -2.19871 1
5.44651 -9.6 -3.17456 1
4.52138 -9.6 -3.65939 1
3.1174 -9.6 -3.69282 1
0.5 -9.6 -3.69282 1
-2.1174 -9.6 -3.69282 1
-3.52138 -9.6 -3.65939 1
-4.44772 -9.6 -3.17266 1
-4.68326 -9.6 -2.15655 1
-4.69282 -9.6 -0.33925 1
-4.69282 -9.6 2.47834 1
-4.69126 -9.6 4.72078 1
-4.59702 -9.6 5.85075 1
-3.84231 -9.6 6.6004 1
-2.77737 -9.6 6.69147 1
-0.799312 -9.6 6.69282 1
1.63224 -9.6 6.69282 1
3.17457 -9.59045 6.69282 1
3.55738 -9.54467 6.69282 1
3.57441 -9.38982 6.69282 1
3.6 -8.07879 6.69282 1
3.6 -5.445 6.69282 1
3.59999 -2.84483 6.69282 1
3.57183 -1.58673 6.69282 1
3.55998 -1.45718 6.69282 1
3.09862 -1.40823 6.69282 1
1.29139 -1.4 6.69282 1
-1.53128 -1.4 6.69282 1
-3.74022 -1.40176 6.69282 1
-4.5455 -1.45234 6.69282 1
-4.55228 -1.46717 6.69282 1
-4.59887 -2.25676 6.69282 1
-4.6 -4.24683 6.69282 1
-4.6 -6.67308 6.69282 1
-4.6 -8.23976 6.68149 1
-4.6 -9.20987 6.4213 1
-4.6 -9.66328 5.48394 1
-4.6 -9.69282 4.03971 1
-4.6 -9.69282 1.39002 1
-4.6 -9.6928 -1.19284 1
-4.6 -9.65507 -2.55837 1
-4.6 -9.13565 -3.47171 1
-4.6 -8.11082 -3.68473 1
-4.6 -6.24313 -3.69282 1
-4.6 -3.416 -3.69282 1
-4.6 -1.2219 -3.69076 1
-4.6 -0.111835 -3.5854 1
-4.6 0.610375 -2.80627 1
-4.6 0.691835 -1.72377 1
-4.6 0.69282 0.293125 1
-4.6 0.69282 2.71355 1
-4.56947 0.69282 4.17145 1
-4.42733 0.69282 4.43365 1
-3.29353 0.69282 4.57545 1
-2.47562e-07 0.69282 4.6 1
2.47559e-07 0.69282 5.4 1
3.01727 0.69282 5.37473 1
4.05293 0.69282 5.10484 1
4.38195 0.69282 4.21881 1
4.4 0.69282 2.48026 1
4.4 0.69282 -0.31825 1
4.39902 0.69282 -2.62982 1
4.32822 0.69282 -3.7237 1
3.8033 0.69282 -4.30581 1
2.85184 0.69282 -4.39795 1
0.936666 0.69282 -4.4 1
-1.50761 0.69282 -4.4 1
-3.15667 0.684665 -4.4 1
-4.13837 0.470151 -4.4 1
-4.65507 -0.441631 -4.4 1
-4.6928 -1.80716 -4.4 1
-4.69282 -4.39002 -4.4 1
-4.69282 -7.03971 -4.4 1
-4.66328 -8.48394 -4.4 1
-4.20869 -9.42213 -4.4 1
-3.20102 -9.6816 -4.4 1
-1.43369 -9.69282 -4.4 1
1.37181 -9.69282 -4.4 1
3.66165 -9.69166 -4.4 1
4.81367 -9.6074 -4.4 1
5.58927 -8.87868 -4.4 1
5.69101 -7.82948 -4.4 1
5.69282 -5.89107 -4.4 1
5.69282 -3.45051 -4.4 1
5.69282 -1.83259 -4.3913 1
5.69282 -1.00358 -4.21338 1
5.69282 -0.633561 -3.50599 1
5.69282 -0.60001 -2.15534 1
5.69282 -0.6 0.445002 1
5.69282 -0.600001 3.07883 1
5.69282 -0.629869 4.47247 1
5.69282 -0.97871 5.19636 1
5.69282 -1.83197 5.38984 1
5.69282 -3.61331 5.4 1
5.69282 -6.42517 5.4 1
5.69282 -8.68943 5.39866 1
5.69282 -9.75327 5.32037 1
5.69282 -10.315 4.77481 1
5.69282 -10.3984 3.80107 1
5.69282 -10.4 1.84528 1
5.69282 -10.4 -0.591042 1
5.68317 -10.4 -2.19871 1
5.44651 -10.4 -3.17456 1
4.52138 -10.4 -3.65939 1
3.1174 -10.4 -3.69282 1
0.5 -10.4 -3.69282 1
-2.1174 -10.4 -3.69282 1
-3.52138 -10.4 -3.65939 1
-4.44772 -10.4 -3.17266 1
-4.68326 -10.4 -2.15655 1
-4.69282 -10.4 -0.33925 1
-4.69282 -10.4 2.47834 1
-4.69126 -10.4 4.72078 1
-4.59702 -10.4 5.85075 1
-3.84231 -10.4 6.6004 1
-2.77737 -10.4 6.69147 1
-0.799311 -10.4 6.69282 1
1.63224 -10.4 6.69282 1
3.20736 -10.3898 6.69282 1
4.0222 -10.1958 6.69282 1
4.37013 -9.47247 6.69282 1
4.4 -8.07883 6.69282 1
4.4 -5.445 6.69282 1
4.39999 -2.84466 6.69282 1
4.36644 -1.49401 6.69282 1
3.99502 -0.785816 6.69282 1
3.12441 -0.60865 6.69282 1
1.29139 -0.6 6.69282 1
-1.53128 -0.6 6.69282 1
-3.74713 -0.601789 6.69282 1
-4.78262 -0.688287 6.69282 1
-5.32331 -1.25383 6.69282 1
-5.39885 -2.25126 6.69282 1
-5.4 -4.24683 6.69282 1
-5.4 -6.67308 6.69282 1
-5.4 -8.23976 6.68149 1
-5.4 -9.20987 6.4213 1
-5.4 -9.66328 5.48394 1
-5.4 -9.69282 4.03971 1
-5.4 -9.69282 1.39002 1
-5.4 -9.6928 -1.19284 1
-5.4 -9.65507 -2.55837 1
-5.4 -9.13565 -3.47171 1
-5.4 -8.11082 -3.68473 1
-5.4 -6.24313 -3.69282 1
-5.4 -3.416 -3.69282 1
-5.4 -1.2219 -3.69076 1
-5.4 -0.111835 -3.5854 1
-5.4 0.610375 -2.80627 1
-5.4 0.691835 -1.72377 1
-5.4 0.69282 0.293125 1
-5.4 0.69282 2.71355 1
-5.36161 0.69282 4.28328 1
-4.74208 0.69282 5.16913 1
-3.3223 0.69282 5.37493 1
2.47558e-07 0.69282 5.4 1
4.95118e-07 2.06477e-08 5.8 1
3.03632 2.06477e-08 5.77428 1
4.3135 2.06477e-08 5.40832 1
4.78112 2.06477e-08 4.24448 1
4.8 2.06477e-08 2.48026 1
4.8 2.06477e-08 -0.318251 1
4.79902 2.06477e-08 -2.63198 1
4.7161 2.06477e-08 -3.82144 1
3.93128 2.06477e-08 -4.68479 1
2.85614 2.06477e-08 -4.79793 1
0.936666 2.06477e-08 -4.8 1
-1.50761 2.06477e-08 -4.8 1
-3.13377 -0.007776 -4.8 1
-3.7714 -0.117495 -4.8 1
-3.96748 -0.526607 -4.8 1
-3.99998 -1.8074 -4.8 1
-4 -4.39002 -4.8 1
-4 -7.0397 -4.8 1
-3.97376 -8.41642 -4.8 1
-3.7956 -8.86594 -4.8 1
-3.17333 -8.98933 -4.8 1
-1.43369 -9 -4.8 1
1.37181 -9 -4.8 1
3.65742 -8.99886 -4.8 1
4.63584 -8.93779 -4.8 1
4.92969 -8.66667 -4.8 1
4.99823 -7.82276 -4.8 1
5 -5.89107 -4.8 1
5 -3.45051 -4.8 1
5 -1.81837 -4.79105 1
5 -0.784824 -4.54827 1
5 -0.236256 -3.55234 1
5 -0.20001 -2.15542 1
5 -0.2 0.445002 1
5 -0.200001 3.07885 1
5 -0.232009 4.51379 1
5 -0.747127 5.52251 1
5 -1.81707 5.78956 1
5 -3.61331 5.8 1
5 -6.42517 5.8 1
5 -8.69218 5.79865 1
5 -9.86105 5.70557 1
5 -10.6975 4.8918 1
5 -10.7984 3.80454 1
5 -10.8 1.84528 1
5 -10.8 -0.591042 1
4.99085 -10.8 -2.17225 1
4.8744 -10.8 -2.7838 1
4.44555 -10.8 -2.97073 1
3.11732 -10.8 -3 1
0.499999 -10.8 -3 1
-2.11732 -10.8 -3 1
-3.44555 -10.8 -2.97073 1
-3.87441 -10.8 -2.78368 1
-3.99085 -10.8 -2.13253 1
-4 -10.8 -0.339249 1
-4 -10.8 2.47834 1
-3.99846 -10.8 4.71542 1
-3.93246 -10.8 5.65489 1
-3.64876 -10.8 5.93516 1
-2.772 -10.8 5.99867 1
-0.799311 -10.8 6 1
1.63224 -10.8 6 1
3.22375 -10.7894 6 1
4.25462 -10.5213 6 1
4.76799 -9.51379 6 1
4.8 -8.07885 6 1
4.8 -5.445 6 1
4.79999 -2.84458 6 1
4.76374 -1.44766 6 1
4.21255 -0.450132 6 1
3.1373 -0.208857 6 1
1.29139 -0.2 6 1
-1.53128 -0.2 6 1
-3.75059 -0.201804 6 1
-4.90118 -0.306261 6 1
-5.70882 -1.14717 6 1
-5.79884 -2.2485 6 1
-5.8 -4.24683 6 1
-5.8 -6.67308 6 1
-5.8 -8.20933 5.98933 1
-5.8 -8.79566 5.86594 1
-5.8 -8.97376 5.41642 1
-5.8 -9 4.0397 1
-5.8 -9 1.39002 1
-5.8 -8.99998 -1.1926 1
-5.8 -8.96748 -2.47339 1
-5.8 -8.77117 -2.88251 1
-5.8 -8.09008 -2.99222 1
-5.8 -6.24313 -3 1
-5.8 -3.416 -3 1
-5.8 -1.22856 -2.99797 1
-5.8 -0.326986 -2.92684 1
-5.8 -0.0596517 -2.63002 1
-5.8 -0.000971976 -1.71955 1
-5.8 2.06477e-08 0.293125 1
-5.8 2.06477e-08 2.71355 1
-5.75769 2.06477e-08 4.33919 1
-4.89945 2.06477e-08 5.53687 1
-3.33668 2.06477e-08 5.77467 1
4.95119e-07 2.06477e-08 5.8 1
2.47559e-07 -0.69282 5.4 1
3.01727 -0.69282 5.37473 1
4.05293 -0.69282 5.10484 1
4.38195 -0.69282 4.21881 1
4.4 -0.69282 2.48026 1
4.4 -0.69282 -0.31825 1
4.39902 -0.69282 -2.62982 1
4.32822 -0.69282 -3.7237 1
3.8033 -0.69282 -4.30581 1
2.85184 -0.69282 -4.39795 1
0.936666 -0.69282 -4.4 1
-1.50761 -0.69282 -4.4 1
-3.11087 -0.700217 -4.4 1
-3.40442 -0.70514 -4.4 1
-3.27989 -0.611583 -4.4 1
-3.30716 -1.80763 -4.4 1
-3.30718 -4.39002 -4.4 1
-3.30718 -7.03969 -4.4 1
-3.28423 -8.3489 -4.4 1
-3.3825 -8.30975 -4.4 1
-3.14564 -8.29707 -4.4 1
-1.43369 -8.30718 -4.4 1
1.37181 -8.30718 -4.4 1
3.65318 -8.30605 -4.4 1
4.45801 -8.26818 -4.4 1
4.2701 -8.45466 -4.4 1
4.30544 -7.81605 -4.4 1
4.30718 -5.89107 -4.4 1
4.30718 -3.45051 -4.4 1
4.30718 -1.83259 -4.3913 1
4.30718 -1.00358 -4.21338 1
4.30718 -0.633561 -3.50599 1
4.30718 -0.60001 -2.15534 1
4.30718 -0.6 0.445002 1
4.30718 -0.600001 3.07883 1
4.30718 -0.629869 4.47247 1
4.30718 -0.97871 5.19636 1
4.30718 -1.83197 5.38984 1
4.30718 -3.61331 5.4 1
4.30718 -6.42517 5.4 1
4.30718 -8.68943 5.39866 1
4.30718 -9.75327 5.32037 1
4.30718 -10.315 4.77481 1
4.30718 -10.3984 3.80107 1
4.30718 -10.4 1.84528 1
4.30718 -10.4 -0.591042 1
4.29854 -10.4 -2.14578 1
4.3023 -10.4 -2.39304 1
4.36972 -10.4 -2.28207 1
3.11724 -10.4 -2.30718 1
0.5 -10.4 -2.30718 1
-2.11724 -10.4 -2.30718 1
-3.36972 -10.4 -2.28207 1
-3.30109 -10.4 -2.39469 1
-3.29845 -10.4 -2.1085 1
-3.30718 -10.4 -0.33925 1
-3.30718 -10.4 2.47834 1
-3.30566 -10.4 4.71006 1
-3.2679 -10.4 5.45902 1
-3.45521 -10.4 5.26993 1
-2.76663 -10.4 5.30587 1
-0.799311 -10.4 5.30718 1
1.63224 -10.4 5.30718 1
3.20736 -10.3898 5.30718 1
4.0222 -10.1958 5.30718 1
4.37013 -9.47247 5.30718 1
4.4 -8.07883 5.30718 1
4.4 -5.445 5.30718 1
4.39999 -2.84466 5.30718 1
4.36644 -1.49401 5.30718 1
3.99502 -0.785816 5.30718 1
3.12441 -0.60865 5.30718 1
1.29139 -0.6 5.30718 1
-1.53128 -0.6 5.30718 1
-3.74713 -0.601789 5.30718 1
-4.78262 -0.688287 5.30718 1
-5.32331 -1.25383 5.30718 1
-5.39885 -2.25126 5.30718 1
-5.4 -4.24683 5.30718 1
-5.4 -6.67308 5.30718 1
-5.4 -8.17891 5.29718 1
-5.4 -8.38144 5.31058 1
-5.4 -8.28423 5.3489 1
-5.4 -8.30718 4.03969 1
-5.4 -8.30718 1.39002 1
-5.4 -8.30716 -1.19237 1
-5.4 -8.27989 -2.38842 1
-5.4 -8.4067 -2.2933 1
-5.4 -8.06934 -2.29971 1
-5.4 -6.24313 -2.30718 1
-5.4 -3.416 -2.30718 1
-5.4 -1.23522 -2.30518 1
-5.4 -0.542138 -2.26827 1
-5.4 -0.729679 -2.45378 1
-5.4 -0.693779 -1.71534 1
-5.4 -0.69282 0.293125 1
-5.4 -0.69282 2.71355 1
-5.36161 -0.69282 4.28328 1
-4.74208 -0.69282 5.16913 1
-3.3223 -0.69282 5.37493 1
2.47562e-07 -0.69282 5.4 1
-2.47559e-07 -0.69282 4.6 1
2.97918 -0.69282 4.57564 1
3.53178 -0.69282 4.49787 1
3.58359 -0.69282 4.16746 1
3.6 -0.69282 2.48026 1
3.6 -0.69282 -0.31825 1
3.59903 -0.69282 -2.6255 1
3.55247 -0.69282 -3.52822 1
3.54734 -0.69282 -3.54786 1
2.84322 -0.69282 -3.598 1
0.936667 -0.69282 -3.6 1
-1.5076 -0.69282 -3.6 1
-3.11087 -0.700217 -3.6 1
-3.40442 -0.70514 -3.6 1
-3.27989 -0.611583 -3.6 1
-3.30716 -1.80763 -3.6 1
-3.30718 -4.39002 -3.6 1
-3.30718 -7.03969 -3.6 1
-3.28423 -8.3489 -3.6 1
-3.3825 -8.30975 -3.6 1
-3.14564 -8.29707 -3.6 1
-1.43369 -8.30718 -3.6 1
1.37181 -8.30718 -3.6 1
3.65318 -8.30605 -3.6 1
4.45801 -8.26818 -3.6 1
4.2701 -8.45466 -3.6 1
4.30544 -7.81605 -3.6 1
4.30718 -5.89107 -3.6 1
4.30718 -3.45051 -3.6 1
4.30718 -1.86104 -3.59181 1
4.30718 -1.44109 -3.54362 1
4.30718 -1.42817 -3.41327 1
4.30718 -1.40001 -2.15517 1
4.30718 -1.4 0.445002 1
4.30718 -1.4 3.07879 1
4.30718 -1.42559 4.38982 1
4.30718 -1.44188 4.54408 1
4.30718 -1.86177 4.59039 1
4.30718 -3.61331 4.6 1
4.30718 -6.42517 4.6 1
4.30718 -8.68391 4.59868 1
4.30718 -9.5377 4.54996 1
4.30718 -9.54995 4.54082 1
4.30718 -9.59847 3.79412 1
4.30718 -9.6 1.84528 1
4.30718 -9.6 -0.591041 1
4.29854 -9.6 -2.14578 1
4.3023 -9.6 -2.39303 1
4.36972 -9.6 -2.28207 1
3.11724 -9.6 -2.30718 1
0.5 -9.6 -2.30718 1
-2.11724 -9.6 -2.30718 1
-3.36972 -9.6 -2.28207 1
-3.30109 -9.6 -2.39469 1
-3.29845 -9.6 -2.1085 1
-3.30718 -9.6 -0.33925 1
-3.30718 -9.6 2.47834 1
-3.30566 -9.6 4.71006 1
-3.2679 -9.6 5.45902 1
-3.45521 -9.6 5.26993 1
-2.76663 -9.6 5.30587 1
-0.799312 -9.6 5.30718 1
1.63224 -9.6 5.30718 1
3.17457 -9.59045 5.30718 1
3.55738 -9.54467 5.30718 1
3.57441 -9.38982 5.30718 1
3.6 -8.07879 5.30718 1
3.6 -5.445 5.30718 1
3.59999 -2.84483 5.30718 1
3.57183 -1.58673 5.30718 1
3.55998 -1.45718 5.30718 1
3.09862 -1.40823 5.30718 1
1.29139 -1.4 5.30718 1
-1.53128 -1.4 5.30718 1
-3.74022 -1.40176 5.30718 1
-4.5455 -1.45234 5.30718 1
-4.55228 -1.46717 5.30718 1
-4.59887 -2.25676 5.30718 1
-4.6 -4.24683 5.30718 1
-4.6 -6.67308 5.30718 1
-4.6 -8.17891 5.29718 1
-4.6 -8.38144 5.31058 1
-4.6 -8.28423 5.3489 1
-4.6 -8.30718 4.03969 1
-4.6 -8.30718 1.39002 1
-4.6 -8.30716 -1.19237 1
-4.6 -8.27989 -2.38842 1
-4.6 -8.4067 -2.2933 1
-4.6 -8.06934 -2.29971 1
-4.6 -6.24313 -2.30718 1
-4.6 -3.416 -2.30718 1
-4.6 -1.23522 -2.30518 1
-4.6 -0.542138 -2.26827 1
-4.6 -0.729679 -2.45378 1
-4.6 -0.693779 -1.71534 1
-4.6 -0.69282 0.293125 1
-4.6 -0.69282 2.71355 1
-4.56947 -0.69282 4.17145 1
-4.42733 -0.69282 4.43365 1
-3.29353 -0.69282 4.57545 1
-2.47558e-07 -0.69282 4.6 1
-4.95118e-07 -3.81011e-08 4.2 1
2.96013 -3.81011e-08 4.17609 1
3.27121 -3.81011e-08 4.19439 1
3.18442 -3.81011e-08 4.14179 1
3.2 -3.81011e-08 2.48026 1
3.2 -3.81011e-08 -0.318249 1
3.19904 -3.81011e-08 -2.62334 1
3.1646 -3.81011e-08 -3.43048 1
3.41936 -3.81011e-08 -3.16889 1
2.83891 -3.81011e-08 -3.19802 1
0.936667 -3.81011e-08 -3.2 1
-1.5076 -3.81011e-08 -3.2 1
-3.13377 -0.00777602 -3.2 1
-3.7714 -0.117495 -3.2 1
-3.96748 -0.526606 -3.2 1
-3.99998 -1.8074 -3.2 1
-4 -4.39002 -3.2 1
-4 -7.0397 -3.2 1
-3.97376 -8.41642 -3.2 1
-3.7956 -8.86594 -3.2 1
-3.17333 -8.98933 -3.2 1
-1.43369 -9 -3.2 1
1.37181 -9 -3.2 1
3.65742 -8.99886 -3.2 1
4.63584 -8.93779 -3.2 1
4.92969 -8.66667 -3.2 1
4.99823 -7.82277 -3.2 1
5 -5.89107 -3.2 1
5 -3.45051 -3.2 1
5 -1.87526 -3.19206 1
5 -1.65984 -3.20873 1
5 -1.82548 -3.36691 1
5 -1.80001 -2.15508 1
5 -1.8 0.445002 1
5 -1.8 3.07876 1
5 -1.82345 4.3485 1
5 -1.67346 4.21793 1
5 -1.87667 4.19067 1
5 -3.61331 4.2 1
5 -6.42517 4.2 1
5 -8.68115 4.19869 1
5 -9.42991 4.16475 1
5 -9.16744 4.42383 1
5 -9.19849 3.79064 1
5 -9.2 1.84528 1
5 -9.2 -0.591041 1
4.99085 -9.2 -2.17225 1
4.8744 -9.2 -2.7838 1
4.44555 -9.2 -2.97073 1
3.11732 -9.2 -3 1
0.5 -9.2 -3 1
-2.11732 -9.2 -3 1
-3.44555 -9.2 -2.97073 1
-3.8744 -9.2 -2.78368 1
-3.99085 -9.2 -2.13253 1
-4 -9.2 -0.339251 1
-4 -9.2 2.47834 1
-3.99846 -9.2 4.71542 1
-3.93246 -9.2 5.65489 1
-3.64876 -9.2 5.93516 1
-2.772 -9.2 5.99867 1
-0.799312 -9.2 6 1
1.63224 -9.2 6 1
3.15818 -9.19079 6 1
3.32497 -9.21911 6 1
3.17655 -9.3485 6 1
3.2 -8.07877 6 1
3.2 -5.445 6 1
3.19999 -2.84492 6 1
3.17453 -1.63309 6 1
3.34245 -1.79287 6 1
3.08572 -1.80803 6 1
1.29139 -1.8 6 1
-1.53128 -1.8 6 1
-3.73676 -1.80175 6 1
-4.42694 -1.83436 6 1
-4.16676 -1.57383 6 1
-4.19888 -2.25952 6 1
-4.2 -4.24683 6 1
-4.2 -6.67308 6 1
-4.2 -8.20933 5.98933 1
-4.2 -8.79565 5.86594 1
-4.2 -8.97376 5.41642 1
-4.2 -9 4.0397 1
-4.2 -9 1.39002 1
-4.2 -8.99998 -1.1926 1
-4.2 -8.96748 -2.47339 1
-4.2 -8.77117 -2.8825 1
-4.2 -8.09008 -2.99222 1
-4.2 -6.24313 -3 1
-4.2 -3.416 -3 1
-4.2 -1.22856 -2.99797 1
-4.2 -0.326987 -2.92684 1
-4.2 -0.059652 -2.63002 1
-4.2 -0.000972041 -1.71956 1
-4.2 -3.81011e-08 0.293124 1
-4.2 -3.81011e-08 2.71355 1
-4.17339 -3.81011e-08 4.11554 1
-4.26996 -3.81011e-08 4.06591 1
-3.27915 -3.81011e-08 4.1757 1
-4.95119e-07 -3.81011e-08 4.2 1
-2.47559e-07 0.69282 4.6 1
2.97918 0.69282 4.57564 1
3.53178 0.69282 4.49787 1
3.58359 0.69282 4.16746 1
3.6 0.69282 2.48026 1
3.6 0.69282 -0.31825 1
3.59903 0.69282 -2.6255 1
3.55247 0.69282 -3.52822 1
3.54734 0.69282 -3.54786 1
2.84322 0.69282 -3.598 1
0.936667 0.69282 -3.6 1
-1.5076 0.69282 -3.6 1
-3.15667 0.684665 -3.6 1
-4.13837 0.470151 -3.6 1
-4.65507 -0.44163 -3.6 1
-4.6928 -1.80716 -3.6 1
-4.69282 -4.39002 -3.6 1
-4.69282 -7.03971 -3.6 1
-4.66328 -8.48394 -3.6 1
-4.20869 -9.42213 -3.6 1
-3.20102 -9.6816 -3.6 1
-1.43369 -9.69282 -3.6 1
1.37181 -9.69282 -3.6 1
3.66165 -9.69166 -3.6 1
4.81367 -9.6074 -3.6 1
5.58927 -8.87868 -3.6 1
5.69101 -7.82948 -3.6 1
5.69282 -5.89107 -3.6 1
5.69282 -3.45051 -3.6 1
5.69282 -1.86104 -3.59181 1
5.69282 -1.44109 -3.54362 1
5.69282 -1.42817 -3.41327 1
5.69282 -1.40001 -2.15517 1
5.69282 -1.4 0.445002 1
5.69282 -1.4 3.07879 1
5.69282 -1.42559 4.38982 1
5.69282 -1.44188 4.54408 1
5.69282 -1.86177 4.59039 1
5.69282 -3.61331 4.6 1
5.69282 -6.42517 4.6 1
5.69282 -8.68391 4.59868 1
5.69282 -9.5377 4.54996 1
5.69282 -9.54995 4.54082 1
5.69282 -9.59847 3.79412 1
5.69282 -9.6 1.84528 1
5.69282 -9.6 -0.591041 1
5.68317 -9.6 -2.19871 1
5.44651 -9.6 -3.17456 1
4.52138 -9.6 -3.65939 1
3.1174 -9.6 -3.69282 1
0.5 -9.6 -3.69282 1
-2.1174 -9.6 -3.69282 1
-3.52138 -9.6 -3.65939 1
-4.44772 -9.6 -3.17266 1
-4.68326 -9.6 -2.15655 1
-4.69282 -9.6 -0.33925 1
-4.69282 -9.6 2.47834 1
-4.69126 -9.6 4.72078 1
-4.59702 -9.6 5.85075 1
-3.84231 -9.6 6.6004 1
-2.77737 -9.6 6.69147 1
-0.799312 -9.6 6.69282 1
1.63224 -9.6 6.69282 1
3.17457 -9.59045 6.69282 1
3.55738 -9.54467 6.69282 1
3.57441 -9.38982 6.69282 1
3.6 -8.07879 6.69282 1
3.6 -5.445 6.69282 1
3.59999 -2.84483 6.69282 1
3.57183 -1.58673 6.69282 1
3.55998 -1.45718 6.69282 1
3.09862 -1.40823 6.69282 1
1.29139 -1.4 6.69282 1
-1.53128 -1.4 6.69282 1
-3.74022 -1.40176 6.69282 1
-4.5455 -1.45234 6.69282 1
-4.55228 -1.46717 6.69282 1
-4.59887 -2.25676 6.69282 1
-4.6 -4.24683 6.69282 1
-4.6 -6.67308 6.69282 1
-4.6 -8.23976 6.68149 1
-4.6 -9.20987 6.4213 1
-4.6 -9.66328 5.48394 1
-4.6 -9.69282 4.03971 1
-4.6 -9.69282 1.39002 1
-4.6 -9.6928 -1.19284 1
-4.6 -9.65507 -2.55837 1
-4.6 -9.13565 -3.47171 1
-4.6 -8.11082 -3.68473 1
-4.6 -6.24313 -3.69282 1
-4.6 -3.416 -3.69282 1
-4.6 -1.2219 -3.69076 1
-4.6 -0.111835 -3.5854 1
-4.6 0.610375 -2.80627 1
-4.6 0.691835 -1.72377 1
-4.6 0.69282 0.293125 1
-4.6 0.69282 2.71355 1
-4.56947 0.69282 4.17145 1
-4.42733 0.69282 4.43365 1
-3.29353 0.69282 4.57545 1
-2.47562e-07 0.69282 4.6 1
2.47559e-07 0.69282 5.4 1
3.01727 0.69282 5.37473 1
4.05293 0.69282 5.10484 1
4.38195 0.69282 4.21881 1
4.4 0.69282 2.48026 1
4.4 0.69282 -0.31825 1
4.39902 0.69282 -2.62982 1
4.32822 0.69282 -3.7237 1
3.8033 0.69282 -4.30581 1
2.85184 0.69282 -4.39795 1
0.936666 0.69282 -4.4 1
-1.50761 0.69282 -4.4 1
-3.15667 0.684665 -4.4 1
-4.13837 0.470151 -4.4 1
-4.65507 -0.441631 -4.4 1
-4.6928 -1.80716 -4.4 1
-4.69282 -4.39002 -4.4 1
-4.69282 -7.03971 -4.4 1
-4.66328 -8.48394 -4.4 1
-4.20869 -9.42213 -4.4 1
-3.20102 -9.6816 -4.4 1
-1.43369 -9.69282 -4.4 1
1.37181 -9.69282 -4.4 1
3.66165 -9.69166 -4.4 1
4.81367 -9.6074 -4.4 1
5.58927 -8.87868 -4.4 1
5.69101 -7.82948 -4.4 1
5.69282 -5.89107 -4.4 1
5.69282 -3.45051 -4.4 1
5.69282 -1.83259 -4.3913 1
5.69282 -1.00358 -4.21338 1
5.69282 -0.633561 -3.50599 1
5.69282 -0.60001 -2.15534 1
5.69282 -0.6 0.445002 1
5.69282 -0.600001 3.07883 1
5.69282 -0.629869 4.47247 1
5.69282 -0.97871 5.19636 1
5.69282 -1.83197 5.38984 1
5.69282 -3.61331 5.4 1
5.69282 -6.42517 5.4 1
5.69282 -8.68943 5.39866 1
5.69282 -9.75327 5.32037 1
5.69282 -10.315 4.77481 1
5.69282 -10.3984 3.80107 1
5.69282 -10.4 1.84528 1
5.69282 -10.4 -0.591042 1
5.68317 -10.4 -2.19871 1
5.44651 -10.4 -3.17456 1
4.52138 -10.4 -3.65939 1
3.1174 -10.4 -3.69282 1
0.5 -10.4 -3.69282 1
-2.1174 -10.4 -3.69282 1
-3.52138 -10.4 -3.65939 1
-4.44772 -10.4 -3.17266 1
-4.68326 -10.4 -2.15655 1
-4.69282 -10.4 -0.33925 1
-4.69282 -10.4 2.47834 1
-4.69126 -10.4 4.72078 1
-4.59702 -10.4 5.85075 1
-3.84231 -10.4 6.6004 1
-2.77737 -10.4 6.69147 1
-0.799311 -10.4 6.69282 1
1.63224 -10.4 6.69282 1
3.20736 -10.3898 6.69282 1
4.0222 -10.1958 6.69282 1
4.37013 -9.47247 6.69282 1
4.4 -8.07883 6.69282 1
4.4 -5.445 6.69282 1
4.39999 -2.84466 6.69282 1
4.36644 -1.49401 6.69282 1
3.99502 -0.785816 6.69282 1
3.12441 -0.60865 6.69282 1
1.29139 -0.6 6.69282 1
-1.53128 -0.6 6.69282 1
-3.74713 -0.601789 6.69282 1
-4.78262 -0.688287 6.69282 1
-5.32331 -1.25383 6.69282 1
-5.39885 -2.25126 6.69282 1
-5.4 -4.24683 6.69282 1
-5.4 -6.67308 6.69282 1
-5.4 -8.23976 6.68149 1
-5.4 -9.20987 6.4213 1
-5.4 -9.66328 5.48394 1
-5.4 -9.69282 4.03971 1
-5.4 -9.69282 1.39002 1
-5.4 -9.6928 -1.19284 1
-5.4 -9.65507 -2.55837 1
-5.4 -9.13565 -3.47171 1
-5.4 -8.11082 -3.68473 1
-5.4 -6.24313 -3.69282 1
-5.4 -3.416 -3.69282 1
-5.4 -1.2219 -3.69076 1
-5.4 -0.111835 -3.5854 1
-5.4 0.610375 -2.80627 1
-5.4 0.691835 -1.72377 1
-5.4 0.69282 0.293125 1
-5.4 0.69282 2.71355 1
-5.36161 0.69282 4.28328 1
-4.74208 0.69282 5.16913 1
-3.3223 0.69282 5.37493 1
2.47558e-07 0.69282 5.4 1
4.95118e-07 2.06477e-08 5.8 1
3.03632 2.06477e-08 5.77428 1
4.3135 2.06477e-08 5.40832 1
4.78112 2.06477e-08 4.24448 1
4.8 2.06477e-08 2.48026 1
4.8 2.06477e-08 -0.318251 1
4.79902 2.06477e-08 -2.63198 1
4.7161 2.06477e-08 -3.82144 1
3.93128 2.06477e-08 -4.68479 1
2.85614 2.06477e-08 -4.79793 1
0.936666 2.06477e-08 -4.8 1
-1.50761 2.06477e-08 -4.8 1
-3.13377 -0.007776 -4.8 1
-3.7714 -0.117495 -4.8 1
-3.96748 -0.526607 -4.8 1
-3.99998 -1.8074 -4.8 1
-4 -4.39002 -4.8 1
-4 -7.0397 -4.8 1
-3.97376 -8.41642 -4.8 1
-3.7956 -8.86594 -4.8 1
-3.17333 -8.98933 -4.8 1
-1.43369 -9 -4.8 1
1.37181 -9 -4.8 1
3.65742 -8.99886 -4.8 1
4.63584 -8.93779 -4.8 1
4.92969 -8.66667 -4.8 1
4.99823 -7.82276 -4.8 1
5 -5.89107 -4.8 1
5 -3.45051 -4.8 1
5 -1.81837 -4.79105 1
5 -0.784824 -4.54827 1
5 -0.236256 -3.55234 1
5 -0.20001 -2.15542 1
5 -0.2 0.445002 1
5 -0.200001 3.07885 1
5 -0.232009 4.51379 1
5 -0.747127 5.52251 1
5 -1.81707 5.78956 1
5 -3.61331 5.8 1
5 -6.42517 5.8 1
5 -8.69218 5.79865 1
5 -9.86105 5.70557 1
5 -10.6975 4.8918 1
5 -10.7984 3.80454 1
5 -10.8 1.84528 1
5 -10.8 -0.591042 1
4.99085 -10.8 -2.17225 1
4.8744 -10.8 -2.7838 1
4.44555 -10.8 -2.97073 1
3.11732 -10.8 -3 1
0.499999 -10.8 -3 1
-2.11732 -10.8 -3 1
-3.44555 -10.8 -2.97073 1
-3.87441 -10.8 -2.78368 1
-3.99085 -10.8 -2.13253 1
-4 -10.8 -0.339249 1
-4 -10.8 2.47834 1
-3.99846 -10.8 4.71542 1
-3.93246 -10.8 5.65489 1
-3.64876 -10.8 5.93516 1
-2.772 -10.8 5.99867 1
-0.799311 -10.8 6 1
1.63224 -10.8 6 1
3.22375 -10.7894 6 1
4.25462 -10.5213 6 1
4.76799 -9.51379 6 1
4.8 -8.07885 6 1
4.8 -5.445 6 1
4.79999 -2.84458 6 1
4.76374 -1.44766 6 1
4.21255 -0.450132 6 1
3.1373 -0.208857 6 1
1.29139 -0.2 6 1
-1.53128 -0.2 6 1
-3.75059 -0.201804 6 1
-4.90118 -0.306261 6 1
-5.70882 -1.14717 6 1
-5.79884 -2.2485 6 1
-5.8 -4.24683 6 1
-5.8 -6.67308 6 1
-5.8 -8.20933 5.98933 1
-5.8 -8.79566 5.86594 1
-5.8 -8.97376 5.41642 1
-5.8 -9 4.0397 1
-5.8 -9 1.39002 1
-5.8 -8.99998 -1.1926 1
-5.8 -8.96748 -2.47339 1
-5.8 -8.77117 -2.88251 1
-5.8 -8.09008 -2.99222 1
-5.8 -6.24313 -3 1
-5.8 -3.416 -3 1
-5.8 -1.22856 -2.99797 1
-5.8 -0.326986 -2.92684 1
-5.8 -0.0596517 -2.63002 1
-5.8 -0.000971976 -1.71955 1
-5.8 2.06477e-08 0.293125 1
-5.8 2.06477e-08 2.71355 1
-5.75769 2.06477e-08 4.33919 1
-4.89945 2.06477e-08 5.53687 1
-3.33668 2.06477e-08 5.77467 1
4.95119e-07 2.06477e-08 5.8 1]
TransformEnd
AttributeEnd
TransformEnd
AttributeEnd
WorldEnd
FrameEnd

[Jrman-commit] drafts/sampleData complexnurbs1.rib,1.1,1.2

From: Gerardo H. <ma...@us...> - 2004-11-13 21:21:45

Update of /cvsroot/jrman/drafts/sampleData
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2521/sampleData

Modified Files:
	complexnurbs1.rib 
Log Message:
NURBS texture tests.

Index: complexnurbs1.rib
===================================================================
RCS file: /cvsroot/jrman/drafts/sampleData/complexnurbs1.rib,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** complexnurbs1.rib	10 Nov 2004 05:48:01 -0000	1.1
--- complexnurbs1.rib	13 Nov 2004 21:21:36 -0000	1.2
***************
*** 1,9 ****
  #Obtained from aqsis tests.
  PixelFilter "gaussian" 2 2
! Format 320 240 1
  Quantize "rgba" 255 0 255 0.5
  Display "complexnurbs1" "framebuffer" "rgba"
  PixelSamples 4 4
! Exposure 1 2.2
  Projection "perspective" "fov" [54.4322]
  ScreenWindow -1 1 -0.75 0.75
--- 1,9 ----
  #Obtained from aqsis tests.
  PixelFilter "gaussian" 2 2
! Format 512 384 1
  Quantize "rgba" 255 0 255 0.5
  Display "complexnurbs1" "framebuffer" "rgba"
  PixelSamples 4 4
! Exposure 1 1.8
  Projection "perspective" "fov" [54.4322]
  ScreenWindow -1 1 -0.75 0.75
***************
*** 14,18 ****
  	TransformEnd 
  	ReverseOrientation 
! 	ShadingRate .25
  	TransformBegin 
  		Attribute "identifier" "string name" ["lgtKeySunShape"]
--- 14,18 ----
  	TransformEnd 
  	ReverseOrientation 
! 	ShadingRate 1
  	TransformBegin 
  		Attribute "identifier" "string name" ["lgtKeySunShape"]
***************
*** 25,29 ****
  		Color [1 1 1]
  		Opacity [1 1 1]
! 		Surface "matte"
  		ShadingInterpolation "smooth"
  		NuPatch 51 4 [0 0 0 0 0.0208333 0.0416667 0.0625
--- 25,31 ----
  		Color [1 1 1]
  		Opacity [1 1 1]
! 		#Surface "matte"
! 		TextureCoordinates 0 0 10 0 0 10 10 10
! 		Surface "paintedplastic" "texturename" "brick.txr"
  		ShadingInterpolation "smooth"
  		NuPatch 51 4 [0 0 0 0 0.0208333 0.0416667 0.0625

[Jrman-commit] drafts/sampleData TextureTest.rib,1.12,1.13

From: Gerardo H. <ma...@us...> - 2004-11-13 20:08:46

Update of /cvsroot/jrman/drafts/sampleData
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18710/sampleData

Modified Files:
	TextureTest.rib 
Log Message:
Added nurbs count to statistics.

Index: TextureTest.rib
===================================================================
RCS file: /cvsroot/jrman/drafts/sampleData/TextureTest.rib,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** TextureTest.rib	16 Apr 2004 05:11:28 -0000	1.12
--- TextureTest.rib	13 Nov 2004 20:07:53 -0000	1.13
***************
*** 31,35 ****
                        1000 -5 0
                        1000 -5 1000]
!                  "texturename" "mandrill.txr" 
  TextureCoordinates 0 0 0 1000 1000 0 1000 1000
  Patch "bilinear" "P" [-1000 5 0
--- 31,35 ----
                        1000 -5 0
                        1000 -5 1000]
!                  "texturename" "mandrill.txr" "blur" 0
  TextureCoordinates 0 0 0 1000 1000 0 1000 1000
  Patch "bilinear" "P" [-1000 5 0

[Jrman-commit] drafts/src/org/jrman/render RendererHidden.java,1.67,1.68

From: Gerardo H. <ma...@us...> - 2004-11-13 20:08:37

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

Modified Files:
	RendererHidden.java 
Log Message:
Added nurbs count to statistics.

Index: RendererHidden.java
===================================================================
RCS file: /cvsroot/jrman/drafts/src/org/jrman/render/RendererHidden.java,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** RendererHidden.java	24 Oct 2004 21:14:38 -0000	1.67
--- RendererHidden.java	13 Nov 2004 20:07:55 -0000	1.68
***************
*** 519,522 ****
--- 519,523 ----
              display("polygons", parser.getPolygonCount());
              display("points", parser.getPointCount());
+             display("nurbs", parser.getNurbsCount());
              System.out.println("Clipped primitives: " + clippedPrimitivesCount);
              System.out.println("Total patches: " + primitivePatchCount);

[Jrman-commit] drafts/src/org/jrman/parser Parser.java,1.100,1.101

From: Gerardo H. <ma...@us...> - 2004-11-13 20:08:09

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

Modified Files:
	Parser.java 
Log Message:
Added nurbs count to statistics.

Index: Parser.java
===================================================================
RCS file: /cvsroot/jrman/drafts/src/org/jrman/parser/Parser.java,v
retrieving revision 1.100
retrieving revision 1.101
diff -C2 -d -r1.100 -r1.101
*** Parser.java	24 Oct 2004 21:14:38 -0000	1.100
--- Parser.java	13 Nov 2004 20:07:56 -0000	1.101
***************
*** 165,168 ****
--- 165,170 ----
      private int pointCount;
      
+     private int nurbsCount;
+     
      public static class State {
  
***************
*** 1261,1264 ****
--- 1263,1267 ----
                      parameters,
                      getAttributes()));
+             nurbsCount++;
          } else {
              final Transform transform = currentAttributes.getTransform();
***************
*** 1266,1270 ****
                  .addPrimitiveCreator(new ObjectInstanceList.PrimitiveCreator() {
                  public Primitive create(Attributes attributes) {
!                     hyperboloidCount++;
                      return new Nurbs(
                              nu,
--- 1269,1273 ----
                  .addPrimitiveCreator(new ObjectInstanceList.PrimitiveCreator() {
                  public Primitive create(Attributes attributes) {
!                     nurbsCount++;
                      return new Nurbs(
                              nu,
***************
*** 1432,1435 ****
--- 1435,1439 ----
          polygonCount = 0;
          pointCount = 0;
+         nurbsCount = 0;
      }
  
***************
*** 1467,1470 ****
--- 1471,1478 ----
          return torusCount;
      }
+     
+     public int getNurbsCount() {
+         return nurbsCount;
+     }
  
  }

[Jrman-commit] drafts/src/org/jrman/primitive Nurbs.java,1.7,1.8

From: Elmer G. <ega...@us...> - 2004-11-10 05:48:10

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

Modified Files:
	Nurbs.java 
Log Message:
Added aqsis tests for nurbs

Index: Nurbs.java
===================================================================
RCS file: /cvsroot/jrman/drafts/src/org/jrman/primitive/Nurbs.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Nurbs.java	8 Nov 2004 03:23:50 -0000	1.7
--- Nurbs.java	10 Nov 2004 05:48:01 -0000	1.8
***************
*** 744,747 ****
--- 744,748 ----
          int uSize = Grid.getUSize();
          int vSize = Grid.getVSize();
+         
          Point3fGrid P = shaderVariables.P;
          Vector3fGrid Ng = shaderVariables.Ng;
***************
*** 845,852 ****
          float[] bv = new float[vorder];
          float[] bvprime = new float[vorder];
-         //if (!(uknot[uorder - 1]  <= u) || !(u < uknot[nu]))
-         //    System.out.println(uknot[uorder - 1] + "<=" + u + "<" + uknot[nu]); 
-         //if (!(vknot[vorder - 1]  <= v) || !(v < vknot[nv]))
-         //   System.out.println(vknot[vorder - 1] + "<=" + v + "<" + vknot[nv]);
  
          // Evaluate non-uniform basis functions (and derivatives) 
--- 846,849 ----

[Jrman-commit] drafts/sampleData simplenurbs.rib,NONE,1.1 complexnurbs1.rib,NONE,1.1

From: Elmer G. <ega...@us...> - 2004-11-10 05:48:10

Update of /cvsroot/jrman/drafts/sampleData
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19680/sampleData

Added Files:
	simplenurbs.rib complexnurbs1.rib 
Log Message:
Added aqsis tests for nurbs

--- NEW FILE: complexnurbs1.rib ---
#Obtained from aqsis tests.
PixelFilter "gaussian" 2 2
Format 320 240 1
Quantize "rgba" 255 0 255 0.5
Display "complexnurbs1" "framebuffer" "rgba"
PixelSamples 4 4
Exposure 1 2.2
Projection "perspective" "fov" [54.4322]
ScreenWindow -1 1 -0.75 0.75
ConcatTransform [0.988756 -0.0132601 0.148946 2.72698e-012 6.7925e-010 0.996061 0.0886753 -2.32023e-014 0.149535 0.0876783 -0.984861 6.76004e-013 101.584 120.618 1086.06 1]
WorldBegin 
	TransformBegin 
		CoordinateSystem "worldspace"
	TransformEnd 
	ReverseOrientation 
	ShadingRate .25
	TransformBegin 
		Attribute "identifier" "string name" ["lgtKeySunShape"]
		Transform [0.879791 0.468986 0.0775911 0 0.145369 -0.420845 0.895409 0 0.452588 -0.776493 -0.438431 0 0 332.23 0 1]
		LightSource "distantlight" 1 "float intensity" [1] "color lightcolor" [1 1 1]
	TransformEnd 
	AttributeBegin 
		Attribute "identifier" "name" ["NURBS"]
		ConcatTransform [1024 0 0 0 0 1024 0 0 0 0 1024 0 0 0 0 1]
		Color [1 1 1]
		Opacity [1 1 1]
		Surface "matte"
		ShadingInterpolation "smooth"
		NuPatch 51 4 [0 0 0 0 0.0208333 0.0416667 0.0625
		0.0833333 0.104167 0.125 0.145833 0.166667 0.1875 0.208333 0.229167 0.25 0.270833 0.291667 0.3125
		0.333333 0.354167 0.375 0.395833 0.416667 0.4375 0.458333 0.479167 0.5 0.520833 0.541667 0.5625
		0.583333 0.604167 0.625 0.645833 0.666667 0.6875 0.708333 0.729167 0.75 0.770833 0.791667 0.8125
		0.833333 0.854167 0.875 0.895833 0.916667 0.9375 0.958333 0.979167 1 1 1 1] 0 1 51 4 [0 0 0 0 0.0208333 0.0416667 0.0625
		0.0833333 0.104167 0.125 0.145833 0.166667 0.1875 0.208333 0.229167 0.25 0.270833 0.291667 0.3125
		0.333333 0.354167 0.375 0.395833 0.416667 0.4375 0.458333 0.479167 0.5 0.520833 0.541667 0.5625
		0.583333 0.604167 0.625 0.645833 0.666667 0.6875 0.708333 0.729167 0.75 0.770833 0.791667 0.8125
		0.833333 0.854167 0.875 0.895833 0.916667 0.9375 0.958333 0.979167 1 1 1 1] 0 1 "Pw" [-0.874966 -0.714487 0.87487 1 -0.86839 -0.770677 0.856206 1 -0.869872 -0.750934 0.833752 1
		-0.881954 -0.692473 0.810567 1 -0.887138 -0.715605 0.77766 1 -0.867989 -0.956524 0.727804 1
		-0.865661 -1.05122 0.68986 1 -0.861252 -0.991221 0.651081 1 -0.848237 -0.880954 0.607616 1
		-0.839255 -0.767115 0.566841 1 -0.836206 -0.660925 0.529737 1 -0.844443 -0.542395 0.498364 1
		-0.842673 -0.551628 0.462037 1 -0.841886 -0.557223 0.426104 1 -0.851727 -0.490458 0.394161 1
		-0.865024 -0.400653 0.362804 1 -0.854197 -0.455256 0.323198 1 -0.856206 -0.449414 0.287706 1
		-0.861084 -0.410338 0.252873 1 -0.864621 -0.374638 0.217523 1 -0.86622 -0.353383 0.1816 1
		-0.866805 -0.345613 0.145377 1 -0.867185 -0.346567 0.108862 1 -0.877869 -0.30469 0.0725931 1
		-0.868537 -0.308536 0.0307734 1 -0.856537 -0.241819 -0.0156922 1 -0.862294 -0.0965497 -0.0599846 1
		-0.869581 -0.0551153 -0.0969573 1 -0.889105 -0.0122939 -0.133138 1 -0.891154 0.0237067 -0.168063 1
		-0.890845 0.045332 -0.20277 1 -0.891765 0.0605967 -0.237704 1 -0.894165 0.0644602 -0.273029 1
		-0.896432 0.0671757 -0.308476 1 -0.881254 0.130606 -0.338961 1 -0.879541 0.178451 -0.372936 1
		-0.878906 0.197308 -0.407101 1 -0.876436 0.224979 -0.440474 1 -0.869428 0.281176 -0.471945 1
		-0.866635 0.325372 -0.50487 1 -0.86648 0.355048 -0.538803 1 -0.866559 0.383954 -0.572826 1
		-0.867149 0.399417 -0.60713 1 -0.87875 0.352793 -0.647567 1 -0.874616 0.357557 -0.679409 1
		-0.870361 0.36656 -0.711022 1 -0.861716 0.408685 -0.739301 1 -0.850547 0.522244 -0.764479 1
		-0.854672 0.550598 -0.796746 1 -0.866003 0.514642 -0.828092 1 -0.877621 0.464852 -0.849941 1
		-0.854119 -0.782042 0.865776 1 -0.841509 -0.799796 0.841211 1 -0.828903 -0.748043 0.805634 1
		-0.824267 -0.696837 0.76826 1 -0.824749 -0.709663 0.733348 1 -0.815275 -0.97642 0.692614 1
		-0.81292 -1.03358 0.656401 1 -0.808541 -0.957042 0.619286 1 -0.80039 -0.849561 0.580261 1
		-0.795226 -0.739971 0.543193 1 -0.793663 -0.636708 0.508367 1 -0.799852 -0.528315 0.477455 1
		-0.798223 -0.536893 0.44264 1 -0.79695 -0.555681 0.407968 1 -0.802934 -0.514503 0.376116 1
		-0.810948 -0.428923 0.34455 1 -0.805227 -0.459416 0.308388 1 -0.805508 -0.477578 0.274081 1
		-0.80861 -0.445038 0.240491 1 -0.812121 -0.396994 0.206864 1 -0.81534 -0.352561 0.173026 1
		-0.81796 -0.32063 0.138885 1 -0.817966 -0.329855 0.103956 1 -0.817454 -0.319387 0.0678862 1
		-0.81381 -0.306599 0.0283695 1 -0.804366 -0.249294 -0.0155796 1 -0.807256 -0.142061 -0.0573005 1
		-0.809896 -0.107949 -0.0926614 1 -0.81957 -0.0829312 -0.126448 1 -0.824585 -0.0469966 -0.159557 1
		-0.826364 -0.0205627 -0.19246 1 -0.827111 -0.002238 -0.225281 1 -0.827597 0.00723737 -0.258035 1
		-0.827969 0.00981175 -0.290774 1 -0.827879 0.0334986 -0.323492 1 -0.823881 0.104628 -0.355498 1
		-0.823441 0.13509 -0.388068 1 -0.822537 0.167126 -0.420426 1 -0.81841 0.235734 -0.451467 1
		-0.816342 0.292536 -0.483095 1 -0.816233 0.330673 -0.515509 1 -0.816524 0.366211 -0.548117 1
		-0.816268 0.403303 -0.580347 1 -0.817017 0.404381 -0.61317 1 -0.822375 0.366327 -0.648562 1
		-0.819889 0.383063 -0.679798 1 -0.814484 0.433232 -0.709207 1 -0.812332 0.547352 -0.740973 1
		-0.824159 0.573803 -0.779554 1 -0.842257 0.534352 -0.816891 1 -0.857733 0.48495 -0.842335 1
		-0.827232 -0.808871 0.861828 1 -0.80318 -0.806267 0.825448 1 -0.770826 -0.705259 0.770625 1
		-0.748964 -0.695594 0.718395 1 -0.738853 -0.900546 0.676977 1 -0.731235 -0.995585 0.637681 1
		-0.727221 -0.949512 0.60219 1 -0.724301 -0.863417 0.56844 1 -0.721248 -0.777537 0.534975 1
		-0.719253 -0.680197 0.502259 1 -0.719286 -0.57153 0.470879 1 -0.722706 -0.483953 0.441197 1
		-0.724646 -0.45795 0.41051 1 -0.722423 -0.520925 0.377777 1 -0.721181 -0.53188 0.345718 1
		-0.725357 -0.456641 0.31578 1 -0.728088 -0.404185 0.285183 1 -0.721291 -0.487372 0.251365 1
		-0.721641 -0.470419 0.219902 1 -0.724933 -0.416541 0.18915 1 -0.730009 -0.352704 0.158619 1
		-0.734413 -0.279112 0.127723 1 -0.736214 -0.269384 0.0959521 1 -0.748288 -0.224728 0.0649614 1
		-0.731388 -0.25812 0.025974 1 -0.720748 -0.208135 -0.0159091 1 -0.717256 -0.152333 -0.0534124 1
		-0.717412 -0.127912 -0.0861633 1 -0.721861 -0.104458 -0.117044 1 -0.729138 -0.0802898 -0.147842 1
		-0.738744 -0.0694498 -0.17939 1 -0.744808 -0.0568512 -0.210826 1 -0.74635 -0.0508687 -0.241547 1
		-0.747144 -0.0392164 -0.272142 1 -0.746516 -0.0221842 -0.302327 1 -0.746096 -0.0129994 -0.332547 1
		-0.746051 0.00442545 -0.362895 1 -0.746222 0.0300711 -0.393338 1 -0.73594 0.126734 -0.418861 1
		-0.732987 0.194413 -0.447431 1 -0.732608 0.239728 -0.477252 1 -0.733038 0.285686 -0.507441 1
		-0.730687 0.359938 -0.535345 1 -0.729977 0.399862 -0.564559 1 -0.730049 0.403396 -0.594245 1
		-0.736566 0.409536 -0.628967 1 -0.736171 0.450771 -0.659957 1 -0.749755 0.55113 -0.703699 1
		-0.774664 0.612611 -0.753514 1 -0.803713 0.57046 -0.801151 1 -0.824046 0.527923 -0.831381 1
		-0.79583 -0.994278 0.862336 1 -0.763348 -1.0027 0.816364 1 -0.717392 -1.00731 0.746663 1
		-0.672497 -0.989114 0.6723 1 -0.65162 -0.956368 0.621036 1 -0.635379 -0.890735 0.575058 1
		-0.627936 -0.777329 0.538716 1 -0.627202 -0.709849 0.509268 1 -0.626298 -0.656823 0.480196 1
		-0.624815 -0.57372 0.450822 1 -0.627548 -0.425438 0.424261 1 -0.625295 -0.423879 0.39461 1
		-0.622133 -0.398952 0.364685 1 -0.622266 -0.487055 0.336493 1 -0.621332 -0.523264 0.308036 1
		-0.620224 -0.526437 0.279586 1 -0.61939 -0.509991 0.251319 1 -0.618381 -0.48662 0.223072 1
		-0.616201 -0.427251 0.194645 1 -0.616958 -0.391668 0.166988 1 -0.618338 -0.370393 0.139359 1
		-0.61562 -0.295291 0.111187 1 -0.612445 -0.308403 0.0825907 1 -0.61351 -0.322555 0.053262 1
		-0.61508 -0.288279 0.0207201 1 -0.6117 -0.217893 -0.0156002 1 -0.610511 -0.171523 -0.0494579 1
		-0.611264 -0.116745 -0.0789386 1 -0.613135 -0.0831605 -0.106218 1 -0.615677 -0.0831695 -0.132863 1
		-0.619183 -0.0889172 -0.159753 1 -0.622029 -0.0927239 -0.186896 1 -0.622739 -0.0971367 -0.213686 1
		-0.623074 -0.0953567 -0.240278 1 -0.62289 -0.0887302 -0.266612 1 -0.622975 -0.0718865 -0.293065 1
		-0.623468 -0.0623806 -0.319769 1 -0.623923 -0.0602159 -0.346557 1 -0.624227 -0.0346776 -0.373255 1
		-0.62474 -0.0115487 -0.400141 1 -0.626399 0.00353272 -0.42791 1 -0.628473 0.0395676 -0.456147 1
		-0.615702 0.220072 -0.47222 1 -0.614198 0.277196 -0.497068 1 -0.613314 0.310905 -0.522094 1
		-0.618007 0.368571 -0.551818 1 -0.634408 0.459156 -0.594221 1 -0.673655 0.537139 -0.659012 1
		-0.71936 0.610627 -0.727692 1 -0.761708 0.561986 -0.789085 1 -0.788104 0.526642 -0.825848 1
		-0.755369 -1.00656 0.855297 1 -0.723324 -1.0105 0.808829 1 -0.670299 -1.29671 0.730766 1
		-0.608077 -0.980763 0.63834 1 -0.575674 -0.83778 0.575906 1 -0.54857 -0.710502 0.520561 1
		-0.535177 -0.605819 0.480509 1 -0.533064 -0.571662 0.452308 1 -0.531069 -0.541667 0.42541 1
		-0.527741 -0.494597 0.397986 1 -0.520757 -0.40293 0.368593 1 -0.517888 -0.412453 0.342038 1
		-0.516 -0.419325 0.316337 1 -0.521978 -0.475738 0.294973 1 -0.522236 -0.513599 0.270555 1
		-0.521203 -0.519752 0.245551 1 -0.51995 -0.516829 0.220545 1 -0.51856 -0.508474 0.195584 1
		-0.51715 -0.482871 0.170717 1 -0.515495 -0.44701 0.145917 1 -0.505329 -0.372092 0.119412 1
		-0.490511 -0.315564 0.0929594 1 -0.485138 -0.312863 0.0685016 1 -0.4907 -0.297577 0.0436458 1
		-0.504811 -0.233948 0.0152294 1 -0.508238 -0.133179 -0.0166239 1 -0.513011 -0.100312 -0.0467061 1
		-0.514598 -0.0475538 -0.0728864 1 -0.515136 -0.0114335 -0.0966613 1 -0.513413 -0.00393532 -0.119246 1
		-0.508607 -0.00680512 -0.140857 1 -0.499112 -0.0115241 -0.160945 1 -0.48647 -0.0181497 -0.179547 1
		-0.480653 -0.0222242 -0.199408 1 -0.479823 -0.011285 -0.220493 1 -0.479452 0.0128334 -0.24161 1
		-0.477425 0.0351793 -0.261886 1 -0.472275 0.0540705 -0.280451 1 -0.467645 0.0640368 -0.298885 1
		-0.461363 0.0897382 -0.31593 1 -0.455009 0.14766 -0.332409 1 -0.449307 0.207125 -0.348779 1
		-0.442198 0.242753 -0.363643 1 -0.437671 0.232756 -0.379867 1 -0.4375 0.212374 -0.399222 1
		-0.473951 0.295124 -0.449995 1 -0.531895 0.406225 -0.526843 1 -0.600238 0.474813 -0.618121 1
		-0.665915 0.586309 -0.706186 1 -0.715974 0.606575 -0.77482 1 -0.749898 0.540005 -0.821466 1
		-0.71668 -1.28802 0.851127 1 -0.685789 -1.28947 0.804657 1 -0.631116 -0.989596 0.72297 1
		-0.56626 -0.66171 0.6258 1 -0.523108 -0.689759 0.552104 1 -0.488651 -0.617131 0.489456 1
		-0.468778 -0.548313 0.444021 1 -0.46081 -0.520208 0.412133 1 -0.456968 -0.504072 0.385543 1
		-0.454816 -0.490094 0.361136 1 -0.446715 -0.429034 0.333067 1 -0.443781 -0.410888 0.308865 1
		-0.442412 -0.397532 0.285894 1 -0.4419 -0.39115 0.263601 1 -0.448781 -0.466158 0.244969 1
		-0.448559 -0.480493 0.22265 1 -0.447602 -0.478468 0.200034 1 -0.446474 -0.472106 0.177429 1
		-0.445324 -0.45876 0.154897 1 -0.444055 -0.431225 0.132441 1 -0.44071 -0.368891 0.109674 1
		-0.434085 -0.313518 0.0865062 1 -0.423861 -0.243507 0.0630113 1 -0.422637 -0.1827 0.0403548 1
		-0.435958 -0.11272 0.0132684 1 -0.444922 -0.0742624 -0.0165794 1 -0.449022 -0.0400374 -0.0445399 1
		-0.450473 -0.029268 -0.0690416 1 -0.450227 0.00783452 -0.0910971 1 -0.448168 0.0267543 -0.111872 1
		-0.44405 0.0387927 -0.131803 1 -0.437636 0.0434893 -0.150824 1 -0.430431 0.0418981 -0.169213 1
		-0.426861 0.0367685 -0.188251 1 -0.426046 0.0571827 -0.20793 1 -0.425782 0.0696571 -0.227707 1
		-0.425014 0.104391 -0.247203 1 -0.423325 0.138533 -0.266183 1 -0.421921 0.134247 -0.285189 1
		-0.420368 0.22461 -0.30398 1 -0.418754 0.252486 -0.322603 1 -0.417657 0.253643 -0.341436 1
		-0.416691 0.248704 -0.360268 1 -0.416667 0.236721 -0.379736 1 -0.416667 0.252202 -0.399222 1
		-0.422799 0.316439 -0.424591 1 -0.478046 0.409101 -0.501109 1 -0.555988 0.469919 -0.603545 1
		-0.626272 0.588457 -0.698235 1 -0.677537 0.634273 -0.769665 1 -0.711819 0.57096 -0.818034 1
		-0.679247 -0.699951 0.848635 1 -0.649931 -0.697741 0.80244 1 -0.594504 -0.76804 0.716304 1
		-0.535626 -0.69991 0.623968 1 -0.484685 -0.64284 0.540724 1 -0.446916 -0.578073 0.473647 1
		-0.424648 -0.531617 0.425573 1 -0.414163 -0.50768 0.391835 1 -0.410013 -0.505626 0.365758 1
		-0.408728 -0.49668 0.342966 1 -0.403769 -0.444594 0.318028 1 -0.402276 -0.414428 0.295805 1
		-0.401565 -0.386859 0.274216 1 -0.401284 -0.370547 0.252959 1 -0.404665 -0.437556 0.23354 1
		-0.404538 -0.449547 0.212275 1 -0.404065 -0.443495 0.190869 1 -0.403505 -0.430758 0.169469 1
		-0.402889 -0.406207 0.148097 1 -0.402025 -0.363249 0.126718 1 -0.400462 -0.301636 0.105246 1
		-0.398526 -0.260878 0.0837801 1 -0.395956 -0.170318 0.0623212 1 -0.397091 -0.145319 0.0395772 1
		-0.4012 -0.082404 0.0124577 1 -0.407712 -0.0592334 -0.015915 1 -0.409852 -0.023214 -0.0427005 1
		-0.407139 0.0113494 -0.06713 1 -0.406844 0.0233799 -0.088328 1 -0.405632 0.0162405 -0.108376 1
		-0.403645 0.0164356 -0.127903 1 -0.400982 0.0267941 -0.147067 1 -0.398251 0.0331722 -0.166024 1
		-0.397039 0.0357889 -0.185263 1 -0.396783 0.0650586 -0.204724 1 -0.396733 0.111148 -0.224232 1
		-0.396612 0.147934 -0.243697 1 -0.396302 0.160067 -0.263058 1 -0.396142 0.155412 -0.282478 1
		-0.396004 0.143183 -0.301895 1 -0.395897 0.217729 -0.32132 1 -0.395853 0.218685 -0.340778 1
		-0.395833 0.202122 -0.360251 1 -0.395833 0.211828 -0.379736 1 -0.395833 0.229416 -0.399222 1
		-0.403187 0.328331 -0.426785 1 -0.453408 0.431905 -0.501531 1 -0.528353 0.495513 -0.60428 1
		-0.594011 0.606245 -0.697324 1 -0.642336 0.654243 -0.767993 1 -0.674332 0.604811 -0.815244 1
		-0.642376 -0.706998 0.846844 1 -0.614725 -0.699267 0.800958 1 -0.56087 -0.718412 0.713308 1
		-0.504378 -0.67836 0.620902 1 -0.453273 -0.598646 0.535054 1 -0.415573 -0.538433 0.466304 1
		-0.393644 -0.505788 0.417695 1 -0.383593 -0.495522 0.384179 1 -0.380022 -0.509311 0.358822 1
		-0.377579 -0.474366 0.335421 1 -0.376696 -0.459415 0.313723 1 -0.376184 -0.421144 0.292442 1
		-0.375921 -0.388537 0.271384 1 -0.375814 -0.367288 0.250445 1 -0.37675 -0.409533 0.230038 1
		-0.376698 -0.426997 0.209108 1 -0.376542 -0.41875 0.188137 1 -0.376363 -0.400387 0.16717 1
		-0.376182 -0.364798 0.146216 1 -0.375916 -0.311308 0.125256 1 -0.375413 -0.263396 0.104241 1
		-0.375157 -0.250612 0.0831919 1 -0.375087 -0.206361 0.0616622 1 -0.375266 -0.106246 0.039111 1
		-0.377234 -0.0861827 0.0118166 1 -0.379353 -0.0672586 -0.0156713 1 -0.381273 -0.0422916 -0.041276 1
		-0.380817 -0.0075892 -0.0651689 1 -0.37976 0.023169 -0.0870954 1 -0.379009 0.0104975 -0.107303 1
		-0.378126 0.0147366 -0.126946 1 -0.377037 0.0158631 -0.146338 1 -0.376017 0.0421655 -0.165644 1
		-0.375486 0.0691548 -0.185025 1 -0.375324 0.086152 -0.204485 1 -0.375386 0.151858 -0.224013 1
		-0.375334 0.155186 -0.243489 1 -0.375221 0.109776 -0.262932 1 -0.375141 0.156539 -0.282383 1
		-0.375078 0.128747 -0.301838 1 -0.375021 0.199803 -0.321292 1 -0.375 0.225613 -0.340765 1
		-0.375 0.202369 -0.360251 1 -0.375 0.232059 -0.379736 1 -0.375 0.2441 -0.399222 1
		-0.384865 0.343778 -0.430235 1 -0.434367 0.470776 -0.507593 1 -0.501735 0.550641 -0.606047 1
		-0.561783 0.646484 -0.696213 1 -0.607477 0.677598 -0.766537 1 -0.637935 0.621992 -0.813982 1
		-0.606092 -0.722973 0.845899 1 -0.575614 -0.762658 0.792648 1 -0.529733 -0.717321 0.713616 1
		-0.474758 -0.664705 0.619244 1 -0.424952 -0.556151 0.531632 1 -0.388527 -0.487551 0.462045 1
		-0.367923 -0.461645 0.413741 1 -0.359053 -0.468192 0.381105 1 -0.356317 -0.508052 0.35657 1
		-0.354877 -0.478827 0.334035 1 -0.354517 -0.46153 0.312788 1 -0.354361 -0.413461 0.291802 1
		-0.354284 -0.384276 0.270906 1 -0.354256 -0.359191 0.250049 1 -0.354243 -0.33881 0.229205 1
		-0.354396 -0.396598 0.208438 1 -0.35437 -0.403533 0.187585 1 -0.354331 -0.389144 0.166727 1
		-0.354295 -0.347603 0.145871 1 -0.354259 -0.281248 0.125009 1 -0.354176 -0.240785 0.104087 1
		-0.354176 -0.238251 0.0829391 1 -0.354236 -0.223617 0.0609352 1 -0.354432 -0.147862 0.0374354 1
		-0.355322 -0.140164 0.0113149 1 -0.356337 -0.107894 -0.0149056 1 -0.357197 -0.0447478 -0.0400148 1
		-0.357229 -0.0711398 -0.0636645 1 -0.356865 -0.0455522 -0.085715 1 -0.356415 -0.0501562 -0.106456 1
		-0.355918 -0.0367811 -0.12643 1 -0.35535 -0.0258687 -0.14605 1 -0.354828 0.0133999 -0.165521 1
		-0.354516 0.0354617 -0.184969 1 -0.354386 0.0536673 -0.204439 1 -0.35436 0.0241697 -0.223929 1
		-0.354329 0.0977581 -0.243409 1 -0.354284 0.126787 -0.262879 1 -0.354241 0.12986 -0.282347 1
		-0.354202 0.158254 -0.301814 1 -0.354183 0.130508 -0.32129 1 -0.354213 0.191643 -0.340823 1
		-0.354363 0.252592 -0.360508 1 -0.354695 0.22208 -0.38042 1 -0.355477 0.238158 -0.400887 1
		-0.368908 0.357286 -0.437218 1 -0.416754 0.521739 -0.516118 1 -0.475381 0.626065 -0.608416 1
		-0.529673 0.702346 -0.695083 1 -0.571908 0.71589 -0.763705 1 -0.598857 0.667284 -0.808132 1
		-0.56478 -0.812699 0.835435 1 -0.540874 -0.811704 0.791204 1 -0.498443 -0.782492 0.713516 1
		-0.446669 -0.729866 0.619206 1 -0.399592 -0.584566 0.531386 1 -0.365148 -0.489689 0.461621 1
		-0.345738 -0.462534 0.413306 1 -0.337487 -0.48211 0.380827 1 -0.334801 -0.523143 0.356151 1
		-0.333655 -0.484391 0.333751 1 -0.333429 -0.457824 0.312608 1 -0.333364 -0.396461 0.291693 1
		-0.333345 -0.37157 0.270841 1 -0.33334 -0.346101 0.250004 1 -0.333339 -0.327935 0.229169 1
		-0.333356 -0.380887 0.208344 1 -0.333352 -0.405998 0.187507 1 -0.333346 -0.39835 0.166669 1
		-0.333342 -0.35757 0.145825 1 -0.333338 -0.292168 0.124962 1 -0.333334 -0.257205 0.10399 1
		-0.33334 -0.255169 0.0825954 1 -0.333379 -0.261473 0.0601601 1 -0.333525 -0.242366 0.0361978 1
		-0.333801 -0.188013 0.0109834 1 -0.334237 -0.123326 -0.0146628 1 -0.334602 -0.110515 -0.0394951 1
		-0.334662 -0.0890918 -0.0630321 1 -0.33456 -0.0636903 -0.0851066 1 -0.334353 -0.0433858 -0.106018 1
		-0.334131 -0.051305 -0.126133 1 -0.333877 -0.0369841 -0.145867 1 -0.333642 -0.0249476 -0.165422 1
		-0.333499 0.016419 -0.184913 1 -0.333432 0.0326534 -0.204395 1 -0.333409 0.0503357 -0.22388 1
		-0.333394 0.072059 -0.243363 1 -0.333379 0.0982909 -0.262844 1 -0.333362 0.121157 -0.282323 1
		-0.33335 0.142343 -0.301804 1 -0.333354 0.160897 -0.321302 1 -0.333427 0.17691 -0.340891 1
		-0.333822 0.194702 -0.360913 1 -0.3353 0.221558 -0.382404 1 -0.338935 0.207029 -0.406747 1
		-0.355166 0.358001 -0.447778 1 -0.398577 0.531832 -0.524601 1 -0.450099 0.659308 -0.612309 1
		-0.499322 0.727849 -0.696394 1 -0.537986 0.741193 -0.763399 1 -0.560414 0.716534 -0.802785 1
		-0.529234 -0.844185 0.835093 1 -0.507082 -0.843865 0.791343 1 -0.465509 -0.90702 0.710239 1
		-0.418946 -0.823114 0.619549 1 -0.375222 -0.632096 0.532393 1 -0.342977 -0.516819 0.462685 1
		-0.324704 -0.496132 0.414245 1 -0.316966 -0.534852 0.381768 1 -0.314038 -0.557192 0.356489 1
		-0.312823 -0.523404 0.33382 1 -0.312571 -0.482671 0.312605 1 -0.31251 -0.416251 0.291681 1
		-0.312501 -0.393821 0.270834 1 -0.3125 -0.372702 0.25 1 -0.3125 -0.354389 0.229167 1
		-0.3125 -0.344981 0.208333 1 -0.312501 -0.413913 0.187499 1 -0.312501 -0.413143 0.16666 1
		-0.3125 -0.367023 0.145811 1 -0.3125 -0.31662 0.124917 1 -0.3125 -0.290525 0.10383 1
		-0.312503 -0.284046 0.0821635 1 -0.31252 -0.287234 0.0594688 1 -0.312577 -0.277809 0.035548 1
		-0.31265 -0.229063 0.0106975 1 -0.312819 -0.196152 -0.01462 1 -0.312948 -0.130258 -0.0392615 1
		-0.312975 -0.105626 -0.0627137 1 -0.312956 -0.0791913 -0.0847897 1 -0.312876 -0.0578434 -0.105776 1
		-0.312796 -0.0410466 -0.125967 1 -0.312699 -0.0511398 -0.145764 1 -0.31261 0.0103776 -0.165365 1
		-0.312558 0.0243915 -0.18488 1 -0.312533 0.0143294 -0.204372 1 -0.312523 0.0294415 -0.223859 1
		-0.312517 0.0470504 -0.243344 1 -0.312514 0.0198818 -0.262829 1 -0.312508 0.0876912 -0.282312 1
		-0.312507 0.105889 -0.301799 1 -0.312521 0.121966 -0.321308 1 -0.312628 0.137106 -0.340947 1
		-0.313179 0.156058 -0.361219 1 -0.315314 0.18469 -0.383736 1 -0.322018 0.254733 -0.412706 1
		-0.339606 0.359129 -0.456831 1 -0.376951 0.483309 -0.528773 1 -0.424765 0.646441 -0.616376 1
		-0.470089 0.717144 -0.699658 1 -0.50628 0.719507 -0.76704 1 -0.52815 0.683788 -0.808184 1
		-0.494242 -0.860598 0.835857 1 -0.473419 -0.897695 0.791775 1 -0.434564 -1.00208 0.710489 1
		-0.391527 -0.87352 0.620477 1 -0.351029 -0.650104 0.533798 1 -0.32098 -0.5327 0.464141 1
		-0.3038 -0.522287 0.415493 1 -0.296421 -0.567416 0.382744 1 -0.292972 -0.553092 0.356296 1
		-0.292024 -0.549984 0.333916 1 -0.29174 -0.507135 0.312618 1 -0.291676 -0.447656 0.291682 1
		-0.291667 -0.427606 0.270834 1 -0.291667 -0.412721 0.25 1 -0.291667 -0.398304 0.229167 1
		-0.291667 -0.390913 0.208333 1 -0.291667 -0.432279 0.187497 1 -0.291667 -0.427718 0.166656 1
		-0.291667 -0.370853 0.145796 1 -0.291667 -0.33332 0.124861 1 -0.291667 -0.315228 0.103663 1
		-0.291668 -0.30591 0.0817821 1 -0.291673 -0.302601 0.0589545 1 -0.29169 -0.28074 0.0350919 1
		-0.291706 -0.19877 0.0104133 1 -0.291761 -0.1828 -0.0146518 1 -0.291799 -0.13714 -0.0391192 1
		-0.291809 -0.110169 -0.0624927 1 -0.291808 -0.13113 -0.0845729 1 -0.291782 -0.0597287 -0.105614 1
		-0.291757 -0.0423663 -0.125862 1 -0.291726 -0.00365904 -0.145704 1 -0.291698 0.0100362 -0.165334 1
		-0.291682 0.0232079 -0.184865 1 -0.291675 0.0362003 -0.204363 1 -0.291672 0.0254721 -0.223852 1
		-0.29167 -0.00802722 -0.243338 1 -0.29167 0.0341064 -0.262824 1 -0.291669 0.0273308 -0.282309 1
		-0.291671 0.092444 -0.301799 1 -0.291691 0.131638 -0.321316 1 -0.291817 0.146209 -0.340994 1
		-0.292442 0.115998 -0.361427 1 -0.294809 0.168763 -0.384481 1 -0.302258 0.273342 -0.415142 1
		-0.317689 0.322478 -0.45759 1 -0.354103 0.468378 -0.531908 1 -0.398093 0.634437 -0.618765 1
		-0.44022 0.700005 -0.702139 1 -0.474469 0.69153 -0.770642 1 -0.495508 0.645263 -0.812978 1
		-0.459672 -0.875874 0.837633 1 -0.440093 -0.961522 0.792964 1 -0.40394 -1.08098 0.711397 1
		-0.36419 -0.909987 0.621695 1 -0.326866 -0.665025 0.535479 1 -0.29911 -0.552781 0.466082 1
		-0.283205 -0.55786 0.417544 1 -0.275973 -0.603909 0.384067 1 -0.272357 -0.577396 0.356854 1
		-0.271237 -0.560479 0.334045 1 -0.27091 -0.520745 0.312636 1 -0.270843 -0.469728 0.291683 1
		-0.270834 -0.454832 0.270834 1 -0.270833 -0.449174 0.25 1 -0.270833 -0.441642 0.229167 1
		-0.270833 -0.432874 0.208333 1 -0.270833 -0.420065 0.187497 1 -0.270833 -0.445399 0.166651 1
		-0.270833 -0.395496 0.145779 1 -0.270833 -0.3531 0.124802 1 -0.270833 -0.329372 0.103498 1
		-0.270834 -0.313841 0.0814533 1 -0.270835 -0.308942 0.0585566 1 -0.270839 -0.297258 0.0347319 1
		-0.270849 -0.252384 0.0101489 1 -0.270857 -0.184459 -0.0146942 1 -0.270867 -0.139104 -0.0390165 1
		-0.27087 -0.111942 -0.0623229 1 -0.270871 -0.108295 -0.0844073 1 -0.270863 -0.0357809 -0.105492 1
		-0.270857 -0.0172264 -0.125788 1 -0.270848 -0.00150015 -0.145665 1 -0.270841 0.012774 -0.165316 1
		-0.270837 0.0261724 -0.184857 1 -0.270835 0.0389155 -0.20436 1 -0.270834 0.0509059 -0.22385 1
		-0.270834 0.0144846 -0.243337 1 -0.270834 0.00677599 -0.262823 1 -0.270834 0.0239979 -0.282309 1
		-0.270837 0.039698 -0.3018 1 -0.270861 0.127407 -0.321325 1 -0.271 0.142668 -0.341037 1
		-0.271655 0.161211 -0.361587 1 -0.274055 0.16621 -0.384952 1 -0.281479 0.27699 -0.416368 1
		-0.296637 0.327458 -0.460088 1 -0.329103 0.456703 -0.53204 1 -0.369806 0.626851 -0.618693 1
		-0.408786 0.696566 -0.701822 1 -0.440178 0.70084 -0.769293 1 -0.458786 0.673103 -0.809445 1
		-0.42529 -0.925074 0.84002 1 -0.404386 -1.12643 0.788529 1 -0.373249 -1.1456 0.712223 1
		-0.336873 -0.92526 0.623113 1 -0.30284 -0.680209 0.537727 1 -0.27775 -0.589841 0.469379 1
		-0.263267 -0.616078 0.421186 1 -0.255794 -0.642522 0.386114 1 -0.251682 -0.588457 0.357387 1
		-0.250438 -0.562176 0.334174 1 -0.250086 -0.526824 0.312666 1 -0.250011 -0.480166 0.291688 1
		-0.250001 -0.467741 0.270835 1 -0.25 -0.46654 0.25 1 -0.25 -0.46456 0.229167 1
		-0.25 -0.459204 0.208332 1 -0.25 -0.446291 0.187495 1 -0.25 -0.458458 0.166646 1
		-0.25 -0.418221 0.145763 1 -0.25 -0.377779 0.124753 1 -0.25 -0.349267 0.10338 1
		-0.25 -0.32323 0.0812402 1 -0.25 -0.308226 0.0582701 1 -0.250001 -0.293896 0.0344508 1
		-0.250004 -0.254555 0.00995408 1 -0.250005 -0.156914 -0.0147572 1 -0.250008 -0.136999 -0.038965 1
		-0.250008 -0.111865 -0.0622125 1 -0.250009 -0.108615 -0.0842932 1 -0.250007 -0.0355611 -0.105405 1
		-0.250005 -0.0151851 -0.125734 1 -0.250003 0.00220749 -0.145636 1 -0.250001 0.0173757 -0.165303 1
		-0.250001 0.0316397 -0.184851 1 -0.25 0.044104 -0.204357 1 -0.25 0.00500002 -0.223849 1
		-0.25 -0.0127837 -0.243336 1 -0.25 0.00229775 -0.262822 1 -0.250001 0.0243364 -0.282309 1
		-0.250004 0.0393922 -0.301801 1 -0.25003 0.103261 -0.321332 1 -0.250174 0.119623 -0.34107 1
		-0.250825 0.140329 -0.361695 1 -0.253134 0.170998 -0.385197 1 -0.259956 0.260855 -0.416471 1
		-0.273867 0.332306 -0.459949 1 -0.302861 0.456707 -0.530072 1 -0.340372 0.629793 -0.616497 1
		-0.376261 0.709876 -0.699218 1 -0.404813 0.730379 -0.765458 1 -0.421247 0.720791 -0.803763 1
		-0.388818 -1.21665 0.837023 1 -0.371939 -1.29293 0.791656 1 -0.343046 -1.1809 0.714366 1
		-0.309606 -0.930474 0.624856 1 -0.279035 -0.709491 0.540808 1 -0.256513 -0.637122 0.473424 1
		-0.242946 -0.656064 0.424521 1 -0.235182 -0.642246 0.387538 1 -0.230895 -0.581241 0.357775 1
		-0.229626 -0.556435 0.334295 1 -0.229262 -0.526059 0.312701 1 -0.229181 -0.481131 0.291696 1
		-0.229168 -0.469316 0.270836 1 -0.229167 -0.469077 0.25 1 -0.229167 -0.4688 0.229166 1
		-0.229167 -0.464824 0.208332 1 -0.229167 -0.441507 0.187495 1 -0.229167 -0.434134 0.166643 1
		-0.229167 -0.412167 0.145752 1 -0.229167 -0.390319 0.124716 1 -0.229167 -0.35421 0.103315 1
		-0.229167 -0.317418 0.0811583 1 -0.229167 -0.292125 0.0580945 1 -0.229167 -0.276699 0.0342362 1
		-0.229168 -0.259019 0.00978364 1 -0.229168 -0.215031 -0.014777 1 -0.229168 -0.149215 -0.0389951 1
		-0.229168 -0.126434 -0.0621863 1 -0.229168 -0.0994423 -0.0842488 1 -0.229168 -0.0264319 -0.105361 1
		-0.229168 -0.00356629 -0.125702 1 -0.229167 0.0156086 -0.145613 1 -0.229167 0.00687722 -0.165288 1
		-0.229167 0.0213037 -0.184842 1 -0.229167 0.0330376 -0.204351 1 -0.229167 -0.00754377 -0.223846 1
		-0.229167 0.00622446 -0.243335 1 -0.229167 0.0697094 -0.262822 1 -0.229167 0.0814032 -0.282309 1
		-0.229171 0.0948998 -0.301802 1 -0.229197 0.110292 -0.321337 1 -0.229335 0.127826 -0.341084 1
		-0.229935 0.150707 -0.361701 1 -0.231988 0.135118 -0.38503 1 -0.23662 0.177062 -0.413204 1
		-0.24909 0.323934 -0.455924 1 -0.274727 0.449133 -0.524149 1 -0.30985 0.639086 -0.611886 1
		-0.342996 0.737715 -0.69477 1 -0.368896 0.774236 -0.760006 1 -0.383589 0.775247 -0.797227 1
		-0.353266 -1.38418 0.835853 1 -0.338261 -1.33516 0.791523 1 -0.312242 -1.16471 0.715061 1
		-0.282158 -0.959247 0.626358 1 -0.254969 -0.77269 0.543709 1 -0.234469 -0.678916 0.476216 1
		-0.221508 -0.646318 0.425848 1 -0.213329 -0.569505 0.386391 1 -0.210018 -0.559279 0.358016 1
		-0.208785 -0.543958 0.334369 1 -0.208431 -0.520601 0.312726 1 -0.208349 -0.476988 0.291703 1
		-0.208335 -0.463801 0.270837 1 -0.208333 -0.463111 0.25 1 -0.208333 -0.462593 0.229166 1
		-0.208333 -0.459098 0.208332 1 -0.208333 -0.433764 0.187493 1 -0.208333 -0.355282 0.166647 1
		-0.208333 -0.347659 0.145771 1 -0.208333 -0.365884 0.12469 1 -0.208333 -0.336897 0.103286 1
		-0.208333 -0.303008 0.0811445 1 -0.208333 -0.274355 0.0580198 1 -0.208333 -0.258696 0.0341018 1
		-0.208333 -0.244874 0.00962586 1 -0.208334 -0.207948 -0.0149513 1 -0.208334 -0.118067 -0.0391628 1
		-0.208334 -0.0946143 -0.0623101 1 -0.208334 -0.0668815 -0.084331 1 -0.208334 0.00723757 -0.105393 1
		-0.208334 0.0326181 -0.125706 1 -0.208333 0.0289622 -0.145597 1 -0.208333 0.0438767 -0.165266 1
		-0.208333 0.0575368 -0.184824 1 -0.208333 0.069787 -0.20434 1 -0.208333 0.0793808 -0.223839 1
		-0.208333 0.0877223 -0.243332 1 -0.208333 0.0969264 -0.26282 1 -0.208334 0.105427 -0.282308 1
		-0.208337 0.117331 -0.301802 1 -0.20836 0.132838 -0.321334 1 -0.208476 0.151471 -0.341056 1
		-0.208958 0.127417 -0.361515 1 -0.210524 0.161344 -0.38416 1 -0.213945 0.201758 -0.410622 1
		-0.223069 0.334651 -0.448782 1 -0.242069 0.392506 -0.508045 1 -0.278491 0.63389 -0.605027 1
		-0.309892 0.748123 -0.690357 1 -0.333625 0.794885 -0.755751 1 -0.346994 0.798342 -0.792896 1
		-0.317256 -1.32548 0.833182 1 -0.303989 -1.23127 0.789679 1 -0.28092 -1.12177 0.714385 1
		-0.25404 -1.00848 0.626288 1 -0.229928 -0.841079 0.544561 1 -0.21139 -0.705553 0.476919 1
		-0.199452 -0.632159 0.425952 1 -0.192213 -0.543578 0.386824 1 -0.188961 -0.509157 0.357828 1
		-0.187908 -0.51581 0.334359 1 -0.187594 -0.513939 0.312739 1 -0.187516 -0.47665 0.291709 1
		-0.187502 -0.457279 0.270838 1 -0.1875 -0.453382 0.25 1 -0.1875 -0.451599 0.229166 1
		-0.1875 -0.444089 0.208331 1 -0.1875 -0.40597 0.187491 1 -0.1875 -0.340827 0.166641 1
		-0.1875 -0.332404 0.145756 1 -0.1875 -0.315845 0.124727 1 -0.1875 -0.294306 0.103381 1
		-0.1875 -0.277986 0.0811371 1 -0.1875 -0.245513 0.0580506 1 -0.1875 -0.236257 0.0340968 1
		-0.1875 -0.215783 0.00952875 1 -0.1875 -0.172403 -0.0152178 1 -0.1875 -0.0634988 -0.0395683 1
		-0.1875 -0.03467 -0.0627543 1 -0.1875 -0.0194533 -0.0846969 1 -0.1875 0.0250332 -0.105598 1
		-0.1875 0.0775703 -0.125794 1 -0.1875 0.0975902 -0.145601 1 -0.1875 0.112993 -0.165238 1
		-0.1875 0.124661 -0.184795 1 -0.1875 0.133929 -0.204319 1 -0.1875 0.140229 -0.223828 1
		-0.1875 0.0962319 -0.243327 1 -0.1875 0.098586 -0.262818 1 -0.1875 0.104692 -0.282308 1
		-0.187503 0.115169 -0.301799 1 -0.187517 0.131929 -0.321317 1 -0.18759 0.152953 -0.34096 1
		-0.187883 0.176905 -0.361075 1 -0.18885 0.23189 -0.382662 1 -0.191044 0.260049 -0.407072 1
		-0.198495 0.340854 -0.44355 1 -0.215963 0.383988 -0.504073 1 -0.249132 0.608589 -0.601786 1
		-0.279055 0.711055 -0.691513 1 -0.301172 0.759325 -0.759152 1 -0.314132 0.747373 -0.799078 1
		-0.284131 -1.07579 0.840622 1 -0.271873 -1.07054 0.79532 1 -0.250436 -1.04521 0.716678 1
		-0.225273 -1.00425 0.624441 1 -0.204242 -0.846835 0.54375 1 -0.188027 -0.713197 0.477011 1
		-0.177389 -0.627978 0.426079 1 -0.170701 -0.532 0.386321 1 -0.167534 -0.430993 0.356596 1
		-0.166873 -0.437792 0.333911 1 -0.166737 -0.489136 0.312696 1 -0.166682 -0.473638 0.291708 1
		-0.166669 -0.452503 0.270839 1 -0.166667 -0.442754 0.25 1 -0.166667 -0.438349 0.229166 1
		-0.166667 -0.414181 0.208331 1 -0.166667 -0.332308 0.187493 1 -0.166667 -0.32404 0.16664 1
		-0.166667 -0.314052 0.14574 1 -0.166667 -0.325196 0.124695 1 -0.166667 -0.322487 0.103328 1
		-0.166667 -0.212459 0.0813175 1 -0.166667 -0.136104 0.0584106 1 -0.166667 -0.181778 0.0342504 1
		-0.166667 -0.179546 0.00951266 1 -0.166667 -0.159983 -0.01554 1 -0.166667 -0.0974241 -0.0400981 1
		-0.166667 0.000734468 -0.0639608 1 -0.166667 0.0780722 -0.0857041 1 -0.166667 0.128592 -0.106163 1
		-0.166667 0.15721 -0.12607 1 -0.166667 0.152435 -0.145652 1 -0.166667 0.168492 -0.165214 1
		-0.166667 0.181579 -0.184764 1 -0.166667 0.191757 -0.204297 1 -0.166667 0.199067 -0.223818 1
		-0.166667 0.203856 -0.243325 1 -0.166667 0.189531 -0.262813 1 -0.166667 0.192367 -0.282305 1
		-0.166667 0.202863 -0.301795 1 -0.16667 0.221787 -0.321288 1 -0.166688 0.242458 -0.340813 1
		-0.166775 0.253352 -0.360494 1 -0.167151 0.259693 -0.38087 1 -0.168062 0.259173 -0.402659 1
		-0.174274 0.327866 -0.438085 1 -0.19129 0.369225 -0.502525 1 -0.221461 0.578504 -0.602291 1
		-0.247534 0.71233 -0.690244 1 -0.267252 0.765924 -0.757913 1 -0.278493 0.753652 -0.796847 1
		-0.246954 -1.07735 0.833436 1 -0.236647 -1.07061 0.789996 1 -0.217677 -1.10002 0.710519 1
		-0.196584 -1.02732 0.622264 1 -0.17709 -0.784984 0.538237 1 -0.163722 -0.66233 0.474118 1
		-0.154502 -0.589184 0.423574 1 -0.149283 -0.52865 0.386036 1 -0.146561 -0.427163 0.356476 1
		-0.146009 -0.435706 0.333887 1 -0.14587 -0.440087 0.312614 1 -0.14584 -0.418149 0.291686 1
		-0.145835 -0.416125 0.270838 1 -0.145833 -0.414803 0.25 1 -0.145833 -0.42056 0.229166 1
		-0.145833 -0.385783 0.20833 1 -0.145833 -0.319295 0.187491 1 -0.145833 -0.310008 0.166635 1
		-0.145833 -0.32307 0.145727 1 -0.145833 -0.309481 0.12467 1 -0.145833 -0.314035 0.10329 1
		-0.145833 -0.218565 0.0812737 1 -0.145833 -0.137644 0.0583755 1 -0.145833 -0.124002 0.0345017 1
		-0.145833 -0.126941 0.00963106 1 -0.145833 -0.133844 -0.0156516 1 -0.145833 -0.0904945 -0.0403022 1
		-0.145833 0.0018904 -0.0639581 1 -0.145833 0.0840773 -0.0853632 1 -0.145833 0.0935193 -0.105502 1
		-0.145833 0.139483 -0.125421 1 -0.145833 0.157769 -0.145207 1 -0.145833 0.173385 -0.164914 1
		-0.145833 0.186396 -0.184564 1 -0.145833 0.196928 -0.204168 1 -0.145833 0.205268 -0.223736 1
		-0.145834 0.211854 -0.243275 1 -0.145834 0.216613 -0.262795 1 -0.145834 0.21938 -0.2823 1
		-0.145834 0.219929 -0.301796 1 -0.145834 0.215825 -0.321284 1 -0.145834 0.23381 -0.340766 1
		-0.145835 0.261206 -0.360255 1 -0.145845 0.278696 -0.379772 1 -0.146151 0.280755 -0.40017 1
		-0.149124 0.276647 -0.428529 1 -0.167268 0.349375 -0.502416 1 -0.193577 0.580194 -0.601925 1
		-0.216659 0.691793 -0.690745 1 -0.234327 0.724964 -0.759949 1 -0.246047 0.678082 -0.806383 1
		-0.210616 -1.08278 0.828339 1 -0.201997 -1.07453 0.78603 1 -0.185957 -1.15231 0.707722 1
		-0.168104 -1.04059 0.620594 1 -0.152297 -0.832842 0.54008 1 -0.140078 -0.666964 0.473081 1
		-0.132281 -0.585024 0.422998 1 -0.127997 -0.536219 0.386173 1 -0.125603 -0.426545 0.356384 1
		-0.125143 -0.435389 0.333853 1 -0.125029 -0.435946 0.312603 1 -0.125005 -0.402084 0.291683 1
		-0.125 -0.338094 0.270834 1 -0.125 -0.331236 0.25 1 -0.125 -0.367093 0.229166 1
		-0.125 -0.316943 0.208331 1 -0.125 -0.309005 0.18749 1 -0.125 -0.323791 0.166631 1
		-0.125 -0.312323 0.145716 1 -0.125 -0.298333 0.124645 1 -0.125 -0.279448 0.103253 1
		-0.125 -0.225099 0.0812348 1 -0.125 -0.194642 0.0583538 1 -0.125 -0.127077 0.0345014 1
		-0.125 -0.120017 0.0096375 1 -0.125 -0.0654027 -0.0158325 1 -0.125 -0.0213893 -0.0406642 1
		-0.125 0.00164778 -0.0628993 1 -0.125 0.0964256 -0.0841805 1 -0.125 0.101643 -0.104559 1
		-0.125 0.121855 -0.124722 1 -0.125 0.139918 -0.14472 1 -0.125 0.155492 -0.164587 1
		-0.125 0.168762 -0.184348 1 -0.125 0.179835 -0.204028 1 -0.125 0.188691 -0.223647 1
		-0.125001 0.217824 -0.243223 1 -0.125001 0.210431 -0.26277 1 -0.125003 0.199626 -0.282301 1
		-0.125005 0.20504 -0.301824 1 -0.125008 0.222893 -0.32134 1 -0.125011 0.245555 -0.340842 1
		-0.125011 0.270506 -0.360311 1 -0.125018 0.289766 -0.379802 1 -0.125342 0.292609 -0.400454 1
		-0.12811 0.287395 -0.429732 1 -0.145355 0.422645 -0.510166 1 -0.166495 0.577615 -0.604356 1
		-0.187097 0.625453 -0.696401 1 -0.202826 0.656469 -0.76826 1 -0.211561 0.657147 -0.808796 1
		-0.174912 -1.09102 0.824989 1 -0.167847 -1.08121 0.783431 1 -0.154638 -1.23876 0.706225 1
		-0.139844 -1.06272 0.61957 1 -0.126756 -0.822824 0.539573 1 -0.116615 -0.656645 0.472901 1
		-0.110267 -0.595284 0.423331 1 -0.106726 -0.554896 0.386509 1 -0.104639 -0.425788 0.356274 1
		-0.104278 -0.434314 0.33383 1 -0.104188 -0.41957 0.312595 1 -0.104168 -0.343304 0.291672 1
		-0.104167 -0.336643 0.270834 1 -0.104167 -0.328089 0.25 1 -0.104167 -0.318948 0.229166 1
		-0.104167 -0.310002 0.208331 1 -0.104167 -0.301105 0.187489 1 -0.104167 -0.315886 0.166627 1
		-0.104167 -0.304778 0.145704 1 -0.104167 -0.291109 0.124618 1 -0.104167 -0.273009 0.103206 1
		-0.104167 -0.248385 0.0811845 1 -0.104167 -0.191446 0.058321 1 -0.104167 -0.148784 0.0344686 1
		-0.104167 -0.0929265 0.00962257 1 -0.104167 -0.0320839 -0.0158046 1 -0.104167 0.0202743 -0.0405739 1
		-0.104167 0.0267813 -0.0619584 1 -0.104167 0.0493617 -0.0829548 1 -0.104167 0.106449 -0.103643 1
		-0.104167 0.104143 -0.124065 1 -0.104167 0.147062 -0.144262 1 -0.104167 0.163075 -0.164274 1
		-0.104167 0.176597 -0.18414 1 -0.104167 0.187275 -0.203892 1 -0.104167 0.193769 -0.223562 1
		-0.104168 0.193644 -0.243175 1 -0.104169 0.176819 -0.262756 1 -0.104173 0.180437 -0.282326 1
		-0.104179 0.194266 -0.30191 1 -0.104192 0.235602 -0.321525 1 -0.104217 0.255551 -0.341189 1
		-0.104263 0.276664 -0.360901 1 -0.104356 0.295594 -0.380686 1 -0.104877 0.304108 -0.402339 1
		-0.108206 0.299199 -0.436058 1 -0.121984 0.455198 -0.514167 1 -0.139249 0.566453 -0.606603 1
		-0.156004 0.633408 -0.696491 1 -0.168985 0.664401 -0.767441 1 -0.176238 0.667036 -0.807608 1
		-0.139623 -1.09753 0.823068 1 -0.134033 -1.37707 0.78197 1 -0.12396 -1.34672 0.708499 1
		-0.112073 -1.03628 0.62098 1 -0.101475 -0.792543 0.540492 1 -0.0934583 -0.657061 0.474312 1
		-0.088331 -0.614488 0.424285 1 -0.085469 -0.587541 0.38722 1 -0.0839716 -0.504298 0.357869 1
		-0.0834207 -0.429297 0.333837 1 -0.0833497 -0.403682 0.312594 1 -0.0833342 -0.345316 0.291672 1
		-0.0833334 -0.339119 0.270834 1 -0.0833333 -0.329983 0.25 1 -0.0833333 -0.319163 0.229166 1
		-0.0833333 -0.332056 0.208331 1 -0.0833333 -0.321109 0.187489 1 -0.0833333 -0.334798 0.166624 1
		-0.0833333 -0.347863 0.145694 1 -0.0833333 -0.286171 0.124595 1 -0.0833333 -0.244627 0.103166 1
		-0.0833333 -0.269606 0.0811382 1 -0.0833333 -0.1899 0.058282 1 -0.0833333 -0.148171 0.0344131 1
		-0.0833333 -0.11689 0.00957221 1 -0.0833333 -0.0504098 -0.0157852 1 -0.0833333 -0.0155257 -0.0386008 1
		-0.0833333 0.0166743 -0.0604882 1 -0.0833333 0.0865255 -0.081864 1 -0.0833333 0.104434 -0.102842 1
		-0.0833333 0.148958 -0.123439 1 -0.0833333 0.183315 -0.143786 1 -0.0833334 0.201147 -0.163931 1
		-0.0833334 0.210282 -0.183906 1 -0.0833336 0.216154 -0.203741 1 -0.0833341 0.217856 -0.223469 1
		-0.0833351 0.212599 -0.24313 1 -0.0833374 0.180418 -0.262753 1 -0.0833428 0.192159 -0.282378 1
		-0.0833549 0.205907 -0.30206 1 -0.0833813 0.24624 -0.321869 1 -0.0834384 0.264079 -0.341896 1
		-0.0835605 0.282439 -0.362269 1 -0.0838275 0.299327 -0.383226 1 -0.0844975 0.311699 -0.405878 1
		-0.0868641 0.311556 -0.437437 1 -0.0981205 0.485078 -0.517334 1 -0.111598 0.595755 -0.607787 1
		-0.124707 0.65942 -0.695763 1 -0.134923 0.688723 -0.765531 1 -0.140647 0.692673 -0.804969 1
		-0.104596 -1.38788 0.822445 1 -0.100428 -1.37599 0.781503 1 -0.0926263 -1.1823 0.705322 1
		-0.0840827 -0.94073 0.621626 1 -0.0762563 -0.750988 0.542164 1 -0.0702516 -0.656332 0.475932 1
		-0.0663448 -0.628998 0.42546 1 -0.0641885 -0.610657 0.388143 1 -0.0630316 -0.528187 0.358289 1
		-0.0625654 -0.395918 0.33385 1 -0.0625058 -0.346197 0.312548 1 -0.0625008 -0.348606 0.291673 1
		-0.0625001 -0.345291 0.270834 1 -0.0625 -0.337464 0.25 1 -0.0625 -0.326096 0.229166 1
		-0.0625 -0.336504 0.208331 1 -0.0625 -0.322161 0.187488 1 -0.0625 -0.333283 0.166623 1
		-0.0625 -0.320757 0.145691 1 -0.0625 -0.307638 0.124587 1 -0.0625 -0.242345 0.103151 1
		-0.0625 -0.244017 0.0811144 1 -0.0625 -0.213639 0.0582518 1 -0.0625 -0.148167 0.0343988 1
		-0.0625 -0.11728 0.00953901 1 -0.0625 -0.0406505 -0.0144049 1 -0.0625 -0.000648823 -0.0372158 1
		-0.0625 0.0338518 -0.0593624 1 -0.0625 0.102641 -0.0808856 1 -0.0625 0.113716 -0.102187 1
		-0.0624999 0.177153 -0.122846 1 -0.0624999 0.197237 -0.143357 1 -0.0624997 0.211528 -0.163604 1
		-0.0624996 0.216368 -0.183677 1 -0.0624997 0.215574 -0.203593 1 -0.0624998 0.218252 -0.223387 1
		-0.0625004 0.215893 -0.243102 1 -0.0625043 0.190876 -0.262763 1 -0.0625103 0.202582 -0.282453 1
		-0.0625243 0.215873 -0.302263 1 -0.0625569 0.230852 -0.322328 1 -0.062631 0.271358 -0.342853 1
		-0.0627963 0.287695 -0.364134 1 -0.0631571 0.302668 -0.386633 1 -0.0639489 0.31405 -0.411477 1
		-0.0662743 0.353928 -0.44704 1 -0.0740732 0.514854 -0.521688 1 -0.0838113 0.61788 -0.609032 1
		-0.0934437 0.680357 -0.695371 1 -0.101035 0.706459 -0.764428 1 -0.105283 0.709976 -0.803236 1
		-0.069084 -1.39316 0.813516 1 -0.0664528 -1.34564 0.774754 1 -0.0616183 -1.12327 0.703647 1
		-0.0560812 -0.88301 0.622405 1 -0.0509155 -0.722805 0.543635 1 -0.0469178 -0.656014 0.477591 1
		-0.0443234 -0.643007 0.427049 1 -0.0428592 -0.620093 0.38905 1 -0.0420228 -0.521669 0.358347 1
		-0.0417464 -0.430221 0.334308 1 -0.0416709 -0.342164 0.312555 1 -0.0416673 -0.350068 0.291674 1
		-0.0416667 -0.351948 0.270834 1 -0.0416667 -0.347746 0.25 1 -0.0416667 -0.337908 0.229166 1
		-0.0416667 -0.347124 0.208331 1 -0.0416667 -0.329534 0.187489 1 -0.0416667 -0.33713 0.166624 1
		-0.0416667 -0.322374 0.145694 1 -0.0416667 -0.308935 0.124595 1 -0.0416667 -0.244378 0.103163 1
		-0.0416667 -0.271536 0.0811201 1 -0.0416667 -0.217611 0.058235 1 -0.0416667 -0.151869 0.034374 1
		-0.0416667 -0.145664 0.00971038 1 -0.0416667 -0.0501383 -0.0135107 1 -0.0416667 -0.00719701 -0.0362808 1
		-0.0416667 0.0137827 -0.0584272 1 -0.0416666 0.109018 -0.0800625 1 -0.0416665 0.139922 -0.101386 1
		-0.0416664 0.180934 -0.122301 1 -0.041666 0.186924 -0.142937 1 -0.0416651 0.208462 -0.163282 1
		-0.0416637 0.219538 -0.18343 1 -0.0416626 0.221655 -0.203424 1 -0.0416606 0.220512 -0.223304 1
		-0.0416584 0.211273 -0.243112 1 -0.0416599 0.205574 -0.262866 1 -0.0416727 0.235969 -0.282542 1
		-0.0416815 0.248598 -0.302496 1 -0.041704 0.262563 -0.322852 1 -0.041761 0.277408 -0.343942 1
		-0.041899 0.29219 -0.366253 1 -0.0422155 0.305609 -0.390459 1 -0.0429371 0.372006 -0.418986 1
		-0.0444376 0.387112 -0.452979 1 -0.0494396 0.524019 -0.524974 1 -0.0558391 0.61113 -0.610178 1
		-0.062238 0.680542 -0.69585 1 -0.0673175 0.706797 -0.764881 1 -0.0701396 0.709016 -0.803522 1
		-0.0344624 -1.25989 0.812358 1 -0.0331432 -1.26315 0.773403 1 -0.0307329 -1.06525 0.702124 1
		-0.0280073 -0.834785 0.622654 1 -0.0254577 -0.704702 0.545109 1 -0.0234907 -0.662938 0.479492 1
		-0.0222023 -0.647921 0.428302 1 -0.0214458 -0.610581 0.389404 1 -0.0210097 -0.503884 0.358336 1
		-0.020875 -0.440039 0.334392 1 -0.0208356 -0.33132 0.312561 1 -0.0208336 -0.345307 0.291676 1
		-0.0208334 -0.353759 0.270834 1 -0.0208333 -0.355333 0.25 1 -0.0208333 -0.349748 0.229166 1
		-0.0208333 -0.336494 0.208331 1 -0.0208333 -0.342164 0.18749 1 -0.0208333 -0.323022 0.166627 1
		-0.0208333 -0.306192 0.145702 1 -0.0208333 -0.316319 0.124612 1 -0.0208333 -0.252927 0.103193 1
		-0.0208333 -0.282108 0.0811496 1 -0.0208333 -0.230492 0.0582373 1 -0.0208333 -0.190916 0.0343117 1
		-0.0208333 -0.133239 0.0104237 1 -0.0208333 -0.0579933 -0.0128285 1 -0.0208333 -0.0276313 -0.0355092 1
		-0.0208333 0.033952 -0.0576967 1 -0.0208332 0.10901 -0.0794278 1 -0.020833 0.147369 -0.100832 1
		-0.0208325 0.178445 -0.121853 1 -0.0208313 0.1945 -0.142556 1 -0.0208285 0.228779 -0.162971 1
		-0.0208242 0.247385 -0.183193 1 -0.0208187 0.253186 -0.203275 1 -0.0208118 0.232015 -0.223259 1
		-0.0208068 0.165736 -0.24318 1 -0.0207946 0.191289 -0.263101 1 -0.0207907 0.204855 -0.283036 1
		-0.0207984 0.216158 -0.30308 1 -0.0208143 0.244265 -0.323389 1 -0.0208111 0.257882 -0.345062 1
		-0.0208381 0.247207 -0.36844 1 -0.0209599 0.30792 -0.394452 1 -0.0212951 0.3886 -0.425723 1
		-0.0221197 0.395792 -0.462168 1 -0.0243956 0.513275 -0.529599 1 -0.0276918 0.583292 -0.612255 1
		-0.030831 0.68829 -0.694793 1 -0.0336207 0.676854 -0.767202 1 -0.0350627 0.675061 -0.806491 1
		9.67818e-005 -1.13413 0.808757 1 8.77817e-005 -1.11656 0.770896 1 8.81628e-005 -0.976944 0.701285 1
		0.000100069 -0.803634 0.623337 1 9.36794e-005 -0.708673 0.546646 1 4.86402e-005 -0.667155 0.480637 1
		6.26578e-006 -0.63464 0.428554 1 -8.42492e-006 -0.598722 0.389339 1 -2.84786e-006 -0.534084 0.359351 1
		7.56228e-007 -0.432619 0.334399 1 1.94684e-007 -0.312394 0.312565 1 2.97382e-008 -0.331457 0.291676 1
		3.55545e-009 -0.346501 0.270834 1 3.32916e-010 -0.355137 0.25 1 2.35879e-011 -0.356225 0.229166 1
		9.93386e-013 -0.348225 0.208331 1 7.95692e-015 -0.356666 0.18749 1 -9.94401e-017 -0.337308 0.166629 1
		-9.83944e-017 -0.318922 0.14571 1 -9.71208e-017 -0.303441 0.124635 1 -9.19648e-017 -0.264257 0.103235 1
		-7.95718e-017 -0.245737 0.0811992 1 -5.86784e-017 -0.267826 0.0582511 1 2.76079e-012 -0.200263 0.0342203 1
		1.1757e-010 -0.116154 0.0107707 1 2.06617e-010 -0.0627784 -0.0123963 1 4.75787e-010 -0.0366347 -0.0350449 1
		7.42589e-008 0.0326321 -0.0572286 1 3.05702e-007 0.106235 -0.0789919 1 6.49812e-007 0.14963 -0.100447 1
		1.518e-006 0.176579 -0.121525 1 3.748e-006 0.196523 -0.142265 1 9.90013e-006 0.248277 -0.162706 1
		1.83094e-005 0.269591 -0.183003 1 2.98436e-005 0.270337 -0.203176 1 4.56526e-005 0.238694 -0.223265 1
		6.31427e-005 0.190113 -0.243312 1 8.73917e-005 0.182078 -0.263369 1 0.000119159 0.19844 -0.28352 1
		0.000133631 0.20888 -0.303714 1 0.000113139 0.248825 -0.323893 1 0.000219021 0.261453 -0.346118 1
		0.000383321 0.27397 -0.370514 1 0.00059663 0.309354 -0.398284 1 0.000871972 0.39341 -0.432452 1
		0.000978963 0.412473 -0.473619 1 0.00103377 0.515766 -0.538775 1 0.000674895 0.581434 -0.618655 1
		0.000474979 0.695304 -0.698955 1 0.000222069 0.669465 -0.768263 1 5.19918e-005 0.571847 -0.819078 1
		0.0344745 -1.01933 0.807166 1 0.0331877 -0.989231 0.769868 1 0.0309447 -0.870567 0.70403 1
		0.0282525 -0.788226 0.624228 1 0.0257092 -0.711988 0.547283 1 0.0236294 -0.651924 0.480555 1
		0.0222097 -0.604226 0.42803 1 0.0214089 -0.569739 0.388858 1 0.0210369 -0.527077 0.359168 1
		0.0208756 -0.431945 0.334344 1 0.0208422 -0.371069 0.312694 1 0.0208337 -0.309541 0.291676 1
		0.0208334 -0.329992 0.270834 1 0.0208333 -0.345616 0.25 1 0.0208333 -0.354426 0.229166 1
		0.0208333 -0.353967 0.208331 1 0.0208333 -0.343767 0.18749 1 0.0208333 -0.350348 0.166631 1
		0.0208333 -0.331103 0.145718 1 0.0208333 -0.31347 0.124659 1 0.0208333 -0.273084 0.103287 1
		0.0208333 -0.230123 0.0812683 1 0.0208333 -0.252126 0.0582848 1 0.0208333 -0.198813 0.0343853 1
		0.0208333 -0.117675 0.0110171 1 0.0208333 -0.0642189 -0.012112 1 0.0208333 -0.0336639 -0.0348079 1
		0.0208335 0.0371424 -0.0569373 1 0.0208339 0.107579 -0.0786856 1 0.0208345 0.14502 -0.100153 1
		0.0208363 0.181744 -0.121239 1 0.0208408 0.224124 -0.141995 1 0.0208488 0.257267 -0.162519 1
		0.0208621 0.26996 -0.182875 1 0.0208812 0.25627 -0.20312 1 0.0209059 0.207926 -0.223303 1
		0.0209418 0.187983 -0.243464 1 0.0209904 0.179745 -0.263675 1 0.0210608 0.195776 -0.284045 1
		0.0211427 0.204053 -0.30463 1 0.0212302 0.215024 -0.325534 1 0.021316 0.264007 -0.347018 1
		0.0217381 0.27565 -0.372292 1 0.0225036 0.363463 -0.402671 1 0.0234874 0.408871 -0.438293 1
		0.0248044 0.423849 -0.482793 1 0.0268609 0.490808 -0.545628 1 0.0295316 0.646132 -0.625562 1
		0.0319803 0.713056 -0.703472 1 0.0340711 0.666428 -0.771851 1 0.0358963 0.49902 -0.829098 1
		0.0684822 -1.00478 0.802632 1 0.0660223 -0.970687 0.766565 1 0.0617068 -0.871536 0.702936 1
		0.0563961 -0.789874 0.624222 1 0.0513097 -0.699892 0.547006 1 0.047162 -0.623479 0.479716 1
		0.0443559 -0.571365 0.427088 1 0.0427888 -0.54163 0.3882 1 0.0420635 -0.510388 0.358863 1
		0.0417482 -0.428034 0.334286 1 0.0416848 -0.385796 0.312709 1 0.0416673 -0.283974 0.291674 1
		0.0416667 -0.307905 0.270834 1 0.0416667 -0.328989 0.25 1 0.0416667 -0.344571 0.229166 1
		0.0416667 -0.351504 0.208331 1 0.0416667 -0.347431 0.18749 1 0.0416667 -0.332448 0.166632 1
		0.0416667 -0.312727 0.145724 1 0.0416667 -0.317379 0.124681 1 0.0416667 -0.275837 0.103342 1
		0.0416667 -0.23267 0.0813535 1 0.0416667 -0.254648 0.0583192 1 0.0416667 -0.172478 0.0345731 1
		0.0416667 -0.140589 0.0112069 1 0.0416667 -0.0873714 -0.0119157 1 0.0416667 -0.0321996 -0.0346069 1
		0.0416669 0.0515385 -0.0567057 1 0.0416674 0.120299 -0.0784628 1 0.0416684 0.153382 -0.0999501 1
		0.041671 0.189771 -0.121042 1 0.041677 0.226917 -0.141834 1 0.0416873 0.229386 -0.162409 1
		0.0417056 0.231935 -0.182805 1 0.0417326 0.226082 -0.2031 1 0.0417724 0.205901 -0.223352 1
		0.0418293 0.194861 -0.24362 1 0.041914 0.198459 -0.263992 1 0.0420253 0.192783 -0.284536 1
		0.0421797 0.197514 -0.305419 1 0.0423961 0.220074 -0.326886 1 0.0427016 0.234702 -0.349328 1
		0.0431811 0.276803 -0.373634 1 0.0445319 0.378646 -0.405317 1 0.0463867 0.411872 -0.442557 1
		0.0490604 0.428344 -0.489214 1 0.0534595 0.543289 -0.555231 1 0.0585753 0.675105 -0.631225 1
		0.0635628 0.722744 -0.706284 1 0.0677743 0.705912 -0.770207 1 0.0705097 0.643653 -0.812085 1
		0.102336 -1.03636 0.798533 1 0.0987642 -0.992078 0.763827 1 0.0924714 -0.879816 0.702379 1
		0.0845181 -0.785163 0.624023 1 0.0768414 -0.680177 0.546274 1 0.0706046 -0.596271 0.478547 1
		0.0664318 -0.54639 0.426035 1 0.0641301 -0.522795 0.387573 1 0.0630742 -0.495174 0.358604 1
		0.0626183 -0.419408 0.334242 1 0.0625267 -0.380096 0.312706 1 0.0625008 -0.259442 0.291673 1
		0.0625002 -0.305057 0.270835 1 0.0625 -0.308544 0.25 1 0.0625 -0.328114 0.229166 1
		0.0625 -0.339807 0.208331 1 0.0625 -0.340058 0.18749 1 0.0625 -0.327441 0.16663 1
		0.0625 -0.3081 0.145719 1 0.0625 -0.287786 0.124678 1 0.0625 -0.270095 0.103352 1
		0.0625 -0.227698 0.0813902 1 0.0625 -0.226174 0.0583184 1 0.0625 -0.167606 0.0347068 1
		0.0625 -0.189417 0.0113966 1 0.0625 -0.138053 -0.0116921 1 0.0625 -0.0263169 -0.0344692 1
		0.0625003 0.058009 -0.0565812 1 0.062501 0.132447 -0.0783311 1 0.0625023 0.158129 -0.0998039 1
		0.0625057 0.19282 -0.120901 1 0.0625131 0.223866 -0.14172 1 0.0625272 0.234661 -0.162312 1
		0.0625496 0.222393 -0.182758 1 0.0625854 0.225453 -0.203091 1 0.0626386 0.213509 -0.223395 1
		0.0627167 0.211233 -0.243736 1 0.0628302 0.203045 -0.264199 1 0.0629809 0.187181 -0.284844 1
		0.0632106 0.19372 -0.305926 1 0.0635423 0.211263 -0.327666 1 0.064007 0.221598 -0.350356 1
		0.0646589 0.27786 -0.374476 1 0.0666278 0.382199 -0.406956 1 0.0694061 0.411934 -0.44524 1
		0.0734865 0.429086 -0.493092 1 0.0799414 0.548362 -0.558681 1 0.0875916 0.678024 -0.633622 1
		0.0950771 0.730465 -0.706828 1 0.101345 0.737866 -0.767996 1 0.10524 0.710169 -0.806047 1
		0.136716 -1.04293 0.79996 1 0.131871 -0.996832 0.764935 1 0.123376 -0.879215 0.703229 1
		0.112621 -0.778783 0.623893 1 0.102268 -0.66418 0.545274 1 0.0939312 -0.577197 0.477234 1
		0.0884233 -0.531388 0.425003 1 0.0854229 -0.506668 0.387 1 0.0840473 -0.467501 0.358294 1
		0.0834803 -0.404162 0.334179 1 0.0833813 -0.376481 0.312778 1 0.0833424 -0.316819 0.291718 1
		0.0833342 -0.305322 0.270838 1 0.0833333 -0.286282 0.25 1 0.0833333 -0.306307 0.229166 1
		0.0833333 -0.39225 0.208329 1 0.0833333 -0.37912 0.187485 1 0.0833333 -0.309745 0.166627 1
		0.0833333 -0.291814 0.145714 1 0.0833333 -0.27281 0.124671 1 0.0833333 -0.25651 0.103357 1
		0.0833333 -0.264715 0.0814416 1 0.0833333 -0.2159 0.0583379 1 0.0833333 -0.23468 0.0348557 1
		0.0833333 -0.218207 0.0115176 1 0.0833333 -0.149869 -0.011582 1 0.0833333 -0.0168296 -0.0343815 1
		0.0833336 0.0605138 -0.0565432 1 0.0833345 0.131572 -0.0782736 1 0.083336 0.175204 -0.0997287 1
		0.0833396 0.199733 -0.120844 1 0.0833472 0.214486 -0.141693 1 0.0833634 0.22334 -0.162293 1
		0.0833915 0.230397 -0.182735 1 0.083433 0.233354 -0.20309 1 0.0834969 0.23177 -0.223412 1
		0.0835899 0.228133 -0.243779 1 0.0837241 0.196314 -0.264269 1 0.0839234 0.187508 -0.285001 1
		0.0842057 0.189821 -0.306107 1 0.0846342 0.206639 -0.327917 1 0.0852212 0.232406 -0.350531 1
		0.0864082 0.338598 -0.376262 1 0.0887169 0.398736 -0.407775 1 0.0923906 0.413841 -0.446434 1
		0.0984579 0.502017 -0.497805 1 0.106856 0.61572 -0.562303 1 0.116568 0.69412 -0.634198 1
		0.126469 0.745675 -0.705891 1 0.134702 0.773554 -0.765088 1 0.139627 0.767237 -0.800568 1
		0.171812 -1.01845 0.805205 1 0.165438 -0.983665 0.76845 1 0.154394 -0.878611 0.70447 1
		0.140701 -0.776194 0.62373 1 0.127589 -0.654171 0.544121 1 0.11714 -0.564765 0.475864 1
		0.110325 -0.515568 0.423972 1 0.10661 -0.466767 0.386208 1 0.104791 -0.394427 0.357019 1
		0.104329 -0.387872 0.334077 1 0.104201 -0.368435 0.31266 1 0.104177 -0.337792 0.291712 1
		0.104168 -0.316811 0.27084 1 0.104167 -0.312794 0.25 1 0.104167 -0.338504 0.229166 1
		0.104167 -0.410309 0.208329 1 0.104167 -0.374796 0.187486 1 0.104167 -0.283087 0.166633 1
		0.104167 -0.266776 0.14573 1 0.104167 -0.250524 0.124706 1 0.104167 -0.237609 0.103445 1
		0.104167 -0.291951 0.0813302 1 0.104167 -0.279034 0.0583926 1 0.104167 -0.260105 0.0349818 1
		0.104167 -0.218433 0.0116237 1 0.104167 -0.143698 -0.0115195 1 0.104167 0.000531276 -0.0344361 1
		0.104167 0.0719154 -0.0565241 1 0.104168 0.148289 -0.0782633 1 0.104169 0.203255 -0.0996862 1
		0.104173 0.224087 -0.120841 1 0.10418 0.218328 -0.141707 1 0.104196 0.215554 -0.162317 1
		0.104224 0.209716 -0.182763 1 0.104272 0.2397 -0.203093 1 0.104342 0.243527 -0.223399 1
		0.104442 0.233726 -0.243743 1 0.104589 0.198142 -0.264201 1 0.104811 0.188581 -0.284892 1
		0.105128 0.185192 -0.30592 1 0.105645 0.209036 -0.327744 1 0.106385 0.240753 -0.350433 1
		0.107858 0.364039 -0.376223 1 0.110664 0.406227 -0.407634 1 0.115629 0.472706 -0.448174 1
		0.123037 0.551884 -0.499077 1 0.133405 0.65149 -0.56285 1 0.145446 0.703332 -0.633722 1
		0.157803 0.759284 -0.704622 1 0.168031 0.80006 -0.762851 1 0.174 0.807301 -0.79689 1
		0.207803 -0.97364 0.813292 1 0.199581 -0.961358 0.773629 1 0.185582 -0.883959 0.705967 1
		0.168815 -0.779038 0.623749 1 0.15286 -0.649984 0.543157 1 0.140281 -0.55221 0.474717 1
		0.132067 -0.476773 0.422744 1 0.127289 -0.396115 0.383678 1 0.125701 -0.381903 0.356829 1
		0.125178 -0.377223 0.334011 1 0.125038 -0.375239 0.312643 1 0.125007 -0.352957 0.291691 1
		0.125002 -0.333597 0.270839 1 0.125 -0.323634 0.25 1 0.125 -0.394291 0.229166 1
		0.125 -0.411725 0.208329 1 0.125 -0.3498 0.187488 1 0.125 -0.249693 0.166636 1
		0.125 -0.236684 0.145738 1 0.125 -0.200684 0.124724 1 0.125 -0.260782 0.103355 1
		0.125 -0.293751 0.0814217 1 0.125 -0.282933 0.0585743 1 0.125 -0.254669 0.0351391 1
		0.125 -0.2129 0.0117306 1 0.125 -0.149717 -0.0114501 1 0.125 -0.0591707 -0.0343074 1
		0.125 0.0738852 -0.05649 1 0.125001 0.160346 -0.0782887 1 0.125002 0.208462 -0.099763 1
		0.125006 0.237148 -0.120906 1 0.125012 0.227029 -0.14177 1 0.125027 0.218499 -0.162372 1
		0.125054 0.203567 -0.1828 1 0.125101 0.234175 -0.203096 1 0.125171 0.236682 -0.223357 1
		0.12527 0.216031 -0.243638 1 0.12541 0.172217 -0.263994 1 0.125654 0.193504 -0.28463 1
		0.125993 0.197674 -0.305548 1 0.126495 0.21171 -0.326976 1 0.127342 0.254807 -0.34955 1
		0.129122 0.375361 -0.375487 1 0.132749 0.464441 -0.408044 1 0.138726 0.551798 -0.448893 1
		0.147822 0.638504 -0.500663 1 0.159737 0.68722 -0.562314 1 0.174226 0.713212 -0.632865 1
		0.189143 0.768428 -0.703638 1 0.201462 0.812574 -0.761649 1 0.208537 0.825048 -0.795028 1
		0.244676 -0.920075 0.823238 1 0.234467 -0.928086 0.78067 1 0.217215 -0.884173 0.708902 1
		0.19702 -0.787574 0.624205 1 0.178054 -0.651809 0.542336 1 0.163224 -0.531436 0.473385 1
		0.152816 -0.404133 0.418611 1 0.148359 -0.387997 0.38326 1 0.146592 -0.374572 0.356656 1
		0.146023 -0.375213 0.333958 1 0.145875 -0.393159 0.312637 1 0.145842 -0.395713 0.291695 1
		0.145834 -0.336862 0.270836 1 0.145833 -0.345677 0.25 1 0.145833 -0.408808 0.229166 1
		0.145833 -0.39834 0.20833 1 0.145833 -0.332895 0.18749 1 0.145833 -0.241528 0.16664 1
		0.145833 -0.231373 0.145749 1 0.145833 -0.246382 0.124696 1 0.145833 -0.264488 0.103392 1
		0.145833 -0.276127 0.0815299 1 0.145833 -0.268364 0.0587664 1 0.145833 -0.238511 0.0352914 1
		0.145833 -0.192827 0.0118208 1 0.145833 -0.133057 -0.011416 1 0.145833 -0.0641861 -0.0343143 1
		0.145834 0.0708339 -0.0565717 1 0.145834 0.151458 -0.0784254 1 0.145835 0.20386 -0.0999325 1
		0.145838 0.241799 -0.121047 1 0.145844 0.237965 -0.141892 1 0.145856 0.22591 -0.162471 1
		0.145877 0.182058 -0.182878 1 0.145921 0.220479 -0.203109 1 0.145983 0.220672 -0.223298 1
		0.14607 0.174172 -0.243483 1 0.146201 0.175588 -0.263721 1 0.146428 0.200183 -0.284184 1
		0.146748 0.211366 -0.304866 1 0.147232 0.233267 -0.325974 1 0.148423 0.37407 -0.349309 1
		0.15049 0.460128 -0.375323 1 0.154184 0.502129 -0.40634 1 0.160847 0.568383 -0.446414 1
		0.171439 0.653286 -0.498232 1 0.185588 0.698883 -0.560431 1 0.202807 0.720095 -0.631631 1
		0.22045 0.772791 -0.702888 1 0.234973 0.81413 -0.761194 1 0.243242 0.826023 -0.794422 1
		0.282116 -0.868927 0.832963 1 0.26991 -0.889711 0.788173 1 0.249228 -0.884493 0.712618 1
		0.225242 -0.802704 0.62477 1 0.203049 -0.66232 0.541256 1 0.185827 -0.516815 0.471551 1
		0.174169 -0.398642 0.417391 1 0.169298 -0.382571 0.382607 1 0.167436 -0.375732 0.356403 1
		0.166861 -0.392028 0.333899 1 0.166737 -0.466177 0.312705 1 0.166679 -0.442619 0.291701 1
		0.166668 -0.37557 0.270837 1 0.166667 -0.417589 0.250001 1 0.166667 -0.424378 0.229166 1
		0.166667 -0.395044 0.208331 1 0.166667 -0.342348 0.187492 1 0.166667 -0.333566 0.166634 1
		0.166667 -0.294032 0.145739 1 0.166667 -0.260203 0.124725 1 0.166667 -0.248793 0.103454 1
		0.166667 -0.249127 0.0816424 1 0.166667 -0.240446 0.0589483 1 0.166667 -0.217031 0.0354313 1
		0.166667 -0.172528 0.0118839 1 0.166667 -0.118212 -0.0114279 1 0.166667 -0.0568538 -0.0343907 1
		0.166667 0.0581102 -0.0568558 1 0.166667 0.117526 -0.0787774 1 0.166668 0.193604 -0.100173 1
		0.16667 0.238522 -0.121272 1 0.166674 0.246455 -0.142088 1 0.166684 0.230838 -0.162625 1
		0.166699 0.188154 -0.182976 1 0.166732 0.204492 -0.203146 1 0.16678 0.194562 -0.223244 1
		0.166853 0.17906 -0.243314 1 0.166952 0.183744 -0.263377 1 0.167142 0.208252 -0.283626 1
		0.16742 0.229445 -0.30405 1 0.167981 0.332511 -0.325224 1 0.16914 0.434687 -0.34806 1
		0.171277 0.492486 -0.373559 1 0.175079 0.512419 -0.403536 1 0.181517 0.516673 -0.440415 1
		0.193317 0.599456 -0.491451 1 0.210735 0.690377 -0.557098 1 0.231051 0.727468 -0.629882 1
		0.251636 0.777424 -0.702149 1 0.268492 0.811297 -0.761103 1 0.27805 0.817359 -0.794563 1
		0.322894 -0.777933 0.851947 1 0.307704 -0.81122 0.80207 1 0.282201 -0.893209 0.718719 1
		0.253079 -0.821366 0.624453 1 0.227469 -0.648913 0.538997 1 0.206452 -0.449593 0.464966 1
		0.195213 -0.400222 0.415628 1 0.190087 -0.38568 0.3817 1 0.188516 -0.459657 0.35681 1
		0.1878 -0.499476 0.334118 1 0.187582 -0.526529 0.312716 1 0.187515 -0.481352 0.291706 1
		0.187503 -0.430054 0.270841 1 0.187501 -0.445827 0.250002 1 0.1875 -0.421483 0.229166 1
		0.1875 -0.382339 0.208332 1 0.1875 -0.386099 0.187492 1 0.1875 -0.357165 0.16664 1
		0.1875 -0.294231 0.145753 1 0.1875 -0.250955 0.12476 1 0.1875 -0.235866 0.103514 1
		0.1875 -0.227575 0.0817392 1 0.1875 -0.215882 0.0591023 1 0.1875 -0.198358 0.0355789 1
		0.1875 -0.152697 0.0119206 1 0.1875 -0.105435 -0.0115098 1 0.1875 -0.0486175 -0.0345626 1
		0.1875 0.0550413 -0.0571706 1 0.1875 0.0775646 -0.0792746 1 0.1875 0.165346 -0.100611 1
		0.187502 0.219888 -0.12163 1 0.187504 0.229831 -0.142391 1 0.18751 0.207277 -0.16289 1
		0.187522 0.191923 -0.183132 1 0.187543 0.197245 -0.203228 1 0.187577 0.182187 -0.223228 1
		0.187631 0.186358 -0.243181 1 0.187703 0.199254 -0.263105 1 0.187857 0.283206 -0.283177 1
		0.188092 0.326688 -0.303396 1 0.188579 0.385036 -0.324211 1 0.189657 0.446873 -0.346532 1
		0.191711 0.497242 -0.371253 1 0.19539 0.516828 -0.399861 1 0.201885 0.520163 -0.435005 1
		0.214946 0.599718 -0.485548 1 0.235098 0.696013 -0.552518 1 0.258696 0.739876 -0.627064 1
		0.282458 0.784048 -0.700771 1 0.30184 0.802425 -0.760784 1 0.312953 0.789449 -0.795235 1
		0.361102 -0.824129 0.85913 1 0.343672 -0.857935 0.807504 1 0.314755 -0.927095 0.72205 1
		0.281046 -0.847654 0.62417 1 0.250022 -0.610705 0.532668 1 0.228087 -0.461972 0.461971 1
		0.216135 -0.417396 0.413842 1 0.211629 -0.47768 0.382656 1 0.209411 -0.516631 0.356697 1
		0.208633 -0.534661 0.334046 1 0.20841 -0.521433 0.312687 1 0.208346 -0.463277 0.291697 1
		0.208337 -0.469227 0.270841 1 0.208334 -0.455579 0.250001 1 0.208333 -0.46943 0.229167 1
		0.208333 -0.436805 0.208332 1 0.208333 -0.397368 0.187493 1 0.208333 -0.347701 0.166644 1
		0.208333 -0.284733 0.145763 1 0.208333 -0.243284 0.124785 1 0.208333 -0.226221 0.103559 1
		0.208333 -0.211696 0.0818157 1 0.208333 -0.200511 0.0592518 1 0.208333 -0.185744 0.0357714 1
		0.208334 -0.141942 0.0119303 1 0.208334 -0.100517 -0.0117039 1 0.208334 -0.0461702 -0.0348881 1
		0.208334 0.0654758 -0.0575577 1 0.208334 0.0893319 -0.0796533 1 0.208334 0.154566 -0.101083 1
		0.208334 0.172008 -0.122184 1 0.208335 0.189267 -0.142825 1 0.208336 0.175849 -0.163221 1
		0.208339 0.122866 -0.183403 1 0.208355 0.181 -0.203376 1 0.208374 0.172437 -0.223264 1
		0.208413 0.198004 -0.243106 1 0.208468 0.277312 -0.262923 1 0.208552 0.3227 -0.282755 1
		0.208716 0.350654 -0.302725 1 0.209118 0.395967 -0.323227 1 0.210026 0.439353 -0.344913 1
		0.211837 0.493153 -0.368641 1 0.215127 0.519813 -0.395545 1 0.221326 0.524658 -0.428505 1
		0.235556 0.602622 -0.478388 1 0.258596 0.704289 -0.546721 1 0.285639 0.752612 -0.62307 1
		0.312852 0.782447 -0.698625 1 0.335513 0.758054 -0.7615 1 0.35041 0.698151 -0.803233 1
		0.399345 -0.979484 0.865188 1 0.379807 -0.985524 0.81234 1 0.347792 -0.967353 0.725785 1
		0.309039 -0.809051 0.623814 1 0.273703 -0.600715 0.52975 1 0.2498 -0.484626 0.459559 1
		0.238754 -0.518345 0.415885 1 0.232702 -0.537199 0.382467 1 0.230244 -0.534949 0.356469 1
		0.229447 -0.512218 0.333943 1 0.229205 -0.447185 0.312586 1 0.229178 -0.477515 0.291692 1
		0.229168 -0.48062 0.270837 1 0.229167 -0.505484 0.250001 1 0.229167 -0.487891 0.229167 1
		0.229167 -0.437121 0.208332 1 0.229167 -0.381746 0.187494 1 0.229167 -0.338367 0.166646 1
		0.229167 -0.291954 0.145768 1 0.229167 -0.24963 0.124803 1 0.229167 -0.227944 0.103594 1
		0.229167 -0.206605 0.0818772 1 0.229167 -0.190172 0.059363 1 0.229167 -0.169804 0.0358921 1
		0.229167 -0.136863 0.0118045 1 0.229167 -0.105998 -0.0121128 1 0.229167 -...
 
[truncated message content]

[Jrman-commit] drafts/sampleData testNu3.rib,1.1,1.2

From: Elmer G. <ega...@us...> - 2004-11-08 03:50:57

Update of /cvsroot/jrman/drafts/sampleData
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15538/sampleData

Modified Files:
	testNu3.rib 
Log Message:
?

Index: testNu3.rib
===================================================================
RCS file: /cvsroot/jrman/drafts/sampleData/testNu3.rib,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** testNu3.rib	7 Nov 2004 22:42:18 -0000	1.1
--- testNu3.rib	8 Nov 2004 03:50:48 -0000	1.2
***************
*** 52,56 ****
  Translate 0 -.4 0
  Surface "matte"
! Displacement "dented" "uniform float noisescale" 2 "uniform integer noiseoctaves" 6 "uniform float Km" 0.3
  Color 1 1 1
  Rotate 210 1 0 0
--- 52,56 ----
  Translate 0 -.4 0
  Surface "matte"
! Displacement "dented" "uniform float noisescale" 2 "uniform integer noiseoctaves" 6 "uniform float Km" 0.1
  Color 1 1 1
  Rotate 210 1 0 0
***************
*** 62,66 ****
  Translate 2.2 -.4 0
  Surface "matte"
! Displacement "turbulence" "uniform float noisescale" 2 "uniform integer noiseoctaves" 4 "uniform float Km" 0.3
  Attribute "displacementbound" "sphere" 0.3
  Color 1 1 1
--- 62,66 ----
  Translate 2.2 -.4 0
  Surface "matte"
! Displacement "turbulence" "uniform float noisescale" 2 "uniform integer noiseoctaves" 4 "uniform float Km" 0.1
  Attribute "displacementbound" "sphere" 0.3
  Color 1 1 1

[Jrman-commit] drafts/src/org/jrman/primitive Nurbs.java,1.6,1.7

From: Elmer G. <ega...@us...> - 2004-11-08 03:23:59

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

Modified Files:
	Nurbs.java 
Log Message:
Fixed UV mapping.
Now noise tests are ok.

Index: Nurbs.java
===================================================================
RCS file: /cvsroot/jrman/drafts/src/org/jrman/primitive/Nurbs.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Nurbs.java	7 Nov 2004 22:42:19 -0000	1.6
--- Nurbs.java	8 Nov 2004 03:23:50 -0000	1.7
***************
*** 329,336 ****
          for (int i = 0; i < kid0.vorder + kid0.nv; i++)
              kid0.vknot[i] = tmp.vknot[i];
-         kid0.umin = kid0.uknot[uorder -1];
-         kid0.umax = kid0.uknot[nu];
-         kid0.vmin = kid0.vknot[vorder -1];
-         kid0.vmax = kid0.vknot[nv];
          /* Second half */
  
--- 329,332 ----
***************
*** 350,357 ****
          for (int i = 0; i < kid1.vorder + kid1.nv; i++)
              kid1.vknot[i] = tmp.vknot[dirflag ? i : (i + splitPt)];
-         kid1.umin = kid1.uknot[uorder -1];
-         kid1.umax = kid1.uknot[nu];
-         kid1.vmin = kid1.vknot[vorder -1];
-         kid1.vmax = kid1.vknot[nv];
  
          /* Construct new corners on the boundry between the two kids */
--- 346,349 ----
***************
*** 729,733 ****
      }
      
!     protected ParameterList nuInterpolateParameters(
              float umin,
              float umax,
--- 721,725 ----
      }
      
!     private ParameterList nuInterpolateParameters(
              float umin,
              float umax,
***************
*** 741,746 ****
      
      protected void dice_P(ShaderVariables shaderVariables) {
-         //System.out.println("dice");
-         
          /*
           * If any normals are sick, fix them now.
--- 733,736 ----

[Jrman-commit] drafts/sampleData testNu2.rib,1.2,1.3

From: Elmer G. <ega...@us...> - 2004-11-08 03:23:58

Update of /cvsroot/jrman/drafts/sampleData
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10174/sampleData

Modified Files:
	testNu2.rib 
Log Message:
Fixed UV mapping.
Now noise tests are ok.

Index: testNu2.rib
===================================================================
RCS file: /cvsroot/jrman/drafts/sampleData/testNu2.rib,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** testNu2.rib	7 Nov 2004 22:42:18 -0000	1.2
--- testNu2.rib	8 Nov 2004 03:23:49 -0000	1.3
***************
*** 4,12 ****
  PixelSamples 4 4
  Exposure 1 2.2
! Projection "perspective" "fov" [10]
  WorldBegin
   Translate 0 0 10
!  #Rotate 90 0 0 1
!  Rotate 230 1 0 0
   LightSource "distantlight" 1 "intensity" [0.8] "from" [10 10 10] "to" [0 0 0]
   ShadingRate .25
--- 4,11 ----
  PixelSamples 4 4
  Exposure 1 2.2
! Projection "perspective" "fov" [40]
  WorldBegin
   Translate 0 0 10
!  Rotate 45 1 1 1
   LightSource "distantlight" 1 "intensity" [0.8] "from" [10 10 10] "to" [0 0 0]
   ShadingRate .25

[Jrman-commit] drafts/src/org/jrman/primitive Nurbs.java,1.5,1.6

From: Elmer G. <ega...@us...> - 2004-11-07 22:42:28

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

Modified Files:
	Nurbs.java 
Log Message:
Fixed bug in NURBS impl, need more work on  texture mapping.

Added noise tests.

Index: Nurbs.java
===================================================================
RCS file: /cvsroot/jrman/drafts/src/org/jrman/primitive/Nurbs.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Nurbs.java	4 Nov 2004 03:11:28 -0000	1.5
--- Nurbs.java	7 Nov 2004 22:42:19 -0000	1.6
***************
*** 95,99 ****
      private SurfSample cnn = new SurfSample();
      
!     private static Point3f tmp = new Point3f();
  
      public Nurbs(int nu, int uorder, float[] uknot, float umin, float umax,
--- 95,105 ----
      private SurfSample cnn = new SurfSample();
      
!     private static Point3f p = new Point3f();
!     private static Vector3f n = new Vector3f();
!     private static Vector3f utan = new Vector3f();
!     private static Vector3f vtan = new Vector3f();
!     private static Point4f r = new Point4f();
!     private static Point4f rutan = new Point4f();
!     private static Point4f rvtan = new Point4f(); 
  
      public Nurbs(int nu, int uorder, float[] uknot, float umin, float umax,
***************
*** 700,707 ****
      public Primitive[] split() {
          Nurbs[] result = new Nurbs[2];
!         result[0] = new Nurbs(nu, uorder, uknot, umin, umax,
!                 nv, vorder, vknot, vmin, vmax, dirflag, parameters, attributes);
!         result[1] = new Nurbs(nu, uorder, uknot, umin, umax,
!                 nv, vorder, vknot, vmin, vmax, dirflag, parameters, attributes);
          splitSurface(result[0], result[1]);
          result[0].setObjectToCamera(objectToCamera);
--- 706,726 ----
      public Primitive[] split() {
          Nurbs[] result = new Nurbs[2];
!         if (dirflag) {
!             float mid = (umax - umin) /2;
!             result[0] = new Nurbs(nu, uorder, uknot, umin, umax,
!                     nv, vorder, vknot, vmin, vmax, dirflag, 
!                     nuInterpolateParameters(umin, mid, vmin, vmax), attributes);
!             result[1] = new Nurbs(nu, uorder, uknot, umin, umax,
!                     nv, vorder, vknot, vmin, vmax, dirflag, 
!                     nuInterpolateParameters(mid, umax, vmin, vmax), attributes);
!         } else {
!             float mid = (vmax - vmin) /2;
!             result[0] = new Nurbs(nu, uorder, uknot, umin, umax,
!                     nv, vorder, vknot, vmin, vmax, dirflag,
!                     nuInterpolateParameters(umin, umax, vmin, mid), attributes);
!             result[1] = new Nurbs(nu, uorder, uknot, umin, umax,
!                     nv, vorder, vknot, vmin, vmax, dirflag, 
!                     nuInterpolateParameters(umin, umax, mid, vmax), attributes);
!         }
          splitSurface(result[0], result[1]);
          result[0].setObjectToCamera(objectToCamera);
***************
*** 710,713 ****
--- 729,743 ----
      }
      
+     protected ParameterList nuInterpolateParameters(
+             float umin,
+             float umax,
+             float vmin,
+             float vmax) {
+             VaryingScalarHPoint paramHp = (VaryingScalarHPoint) parameters.getParameter("Pw");
+             ParameterList result = linearInterpolateParameters(umin, umax, vmin, vmax);
+             result.addParameter(paramHp);
+             return result;
+     } 
+     
      protected void dice_P(ShaderVariables shaderVariables) {
          //System.out.println("dice");
***************
*** 729,745 ****
          /* Compute points on curve */
          for (int u = 0; u < uSize; u++) {
!             float uPos = ( u /(float) uSize)
                  * (uknot[nu] - uknot[uorder - 1])
                  + uknot[uorder - 1];
              for (int v = 0; v < vSize; v++) {
!                 float vPos = (v / (float) vSize)
                      * (vknot[nv] - vknot[vorder - 1])
                      + vknot[vorder - 1];
-                 Vector3f n = new Vector3f();
-                 Vector3f utan = new Vector3f();
-                 Vector3f vtan = new Vector3f();
                  
!                 calcPoint( uPos, vPos, tmp, utan, vtan );
!                 P.set(u, v, tmp);
  
                  n.cross(utan, vtan);
--- 759,772 ----
          /* Compute points on curve */
          for (int u = 0; u < uSize; u++) {
!             float uPos = ( u /(float) (uSize - 1))
                  * (uknot[nu] - uknot[uorder - 1])
                  + uknot[uorder - 1];
              for (int v = 0; v < vSize; v++) {
!                 float vPos = (v / (float) (vSize - 1))
                      * (vknot[nv] - vknot[vorder - 1])
                      + vknot[vorder - 1];
                  
!                 calcPoint( uPos, vPos, p, utan, vtan );
!                 P.set(u, v, p);
  
                  n.cross(utan, vtan);
***************
*** 790,794 ****
              int i = brkPoint - r + 1;
              bvals[r - 1] = 0.0F;
!             for (int s = r-2; s >= 0; s--) {
                  i++;
                  float omega;
--- 817,821 ----
              int i = brkPoint - r + 1;
              bvals[r - 1] = 0.0F;
!             for (int s = r - 2; s >= 0; s--) {
                  i++;
                  float omega;
***************
*** 828,838 ****
          float[] bv = new float[vorder];
          float[] bvprime = new float[vorder];
!         Point4f r = new Point4f();
!         Point4f rutan = new Point4f();
!         Point4f rvtan = new Point4f(); 
!         if (!(uknot[uorder - 1]  <= u) || !(u < uknot[nu]))
!             System.out.println(uknot[uorder - 1] + "<=" + u + "<" + uknot[nu]); 
!         if (!(vknot[vorder - 1]  <= v) || !(v < vknot[nv]))
!             System.out.println(vknot[vorder - 1] + "<=" + v + "<" + vknot[nv]);
  
          // Evaluate non-uniform basis functions (and derivatives) 
--- 855,862 ----
          float[] bv = new float[vorder];
          float[] bvprime = new float[vorder];
!         //if (!(uknot[uorder - 1]  <= u) || !(u < uknot[nu]))
!         //    System.out.println(uknot[uorder - 1] + "<=" + u + "<" + uknot[nu]); 
!         //if (!(vknot[vorder - 1]  <= v) || !(v < vknot[nv]))
!         //   System.out.println(vknot[vorder - 1] + "<=" + v + "<" + vknot[nv]);
  
          // Evaluate non-uniform basis functions (and derivatives) 
***************
*** 850,855 ****
              basisDerivatives( v, vbrkPoint, vknot, vorder, bvprime );
          // Weight control points against the basis functions 
          
!         for (int i = 0; i < vorder; i++)
              for (int j = 0; j < uorder; j++)
              {
--- 874,892 ----
              basisDerivatives( v, vbrkPoint, vknot, vorder, bvprime );
          // Weight control points against the basis functions 
+         r.x = 0;
+         r.y = 0;
+         r.z = 0;
+         r.w = 0;
          
!         rutan.x = 0;
!         rutan.y = 0;
!         rutan.z = 0;
!         rutan.w = 0;
!         
!         rvtan.x = 0;
!         rvtan.y = 0;
!         rvtan.z = 0;
!         rvtan.w = 0;
!         for (int i = 0; i < vorder; i++) {
              for (int j = 0; j < uorder; j++)
              {
***************
*** 881,884 ****
--- 918,922 ----
                  }
              }
+         }
  
          // Project tangents, using the quotient rule for differentiation

[Jrman-commit] drafts/src/org/jrman/parameters ParameterList.java,1.7,1.8 Parameter.java,1.4,1.5

From: Elmer G. <ega...@us...> - 2004-11-07 22:42:28

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

Modified Files:
	ParameterList.java Parameter.java 
Log Message:
Fixed bug in NURBS impl, need more work on  texture mapping.

Added noise tests.

Index: ParameterList.java
===================================================================
RCS file: /cvsroot/jrman/drafts/src/org/jrman/parameters/ParameterList.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ParameterList.java	9 Apr 2004 22:33:21 -0000	1.7
--- ParameterList.java	7 Nov 2004 22:42:18 -0000	1.8
***************
*** 95,98 ****
--- 95,102 ----
          }
      }
+     
+     public String toString() {
+         return list.toString();
+     	}
  
  }

Index: Parameter.java
===================================================================
RCS file: /cvsroot/jrman/drafts/src/org/jrman/parameters/Parameter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Parameter.java	8 Apr 2004 21:03:32 -0000	1.4
--- Parameter.java	7 Nov 2004 22:42:18 -0000	1.5
***************
*** 39,42 ****
--- 39,46 ----
      
      public abstract Parameter selectValues(int[] indexes);
+     
+     public String toString() {
+         return declaration.toString();
+     }
  
  }

[Jrman-commit] drafts/sampleData testNu3.rib,NONE,1.1 testNu2.rib,1.1,1.2 testNu.rib,1.2,1.3

From: Elmer G. <ega...@us...> - 2004-11-07 22:42:27

Update of /cvsroot/jrman/drafts/sampleData
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12015/sampleData

Modified Files:
	testNu2.rib testNu.rib 
Added Files:
	testNu3.rib 
Log Message:
Fixed bug in NURBS impl, need more work on  texture mapping.

Added noise tests.

Index: testNu.rib
===================================================================
RCS file: /cvsroot/jrman/drafts/sampleData/testNu.rib,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** testNu.rib	4 Nov 2004 03:11:28 -0000	1.2
--- testNu.rib	7 Nov 2004 22:42:18 -0000	1.3
***************
*** 8,16 ****
   Translate 0 0 40
   Rotate 210 1 0 0
!  LightSource "distantlight" 1 "intensity" [0.8] "from" [-10 -10 10] "to" [0 0 0]
   ShadingRate .25
   Color .3 .5 1
!  #Surface "paintedplastic" "texturename" "checkerboard.txr"
! ReadArchive "vase.rib"
  
  WorldEnd
--- 8,16 ----
   Translate 0 0 40
   Rotate 210 1 0 0
!  LightSource "distantlight" 1 "intensity" [0.8] "from" [10 10 10] "to" [0 0 0]
   ShadingRate .25
   Color .3 .5 1
!  Surface "paintedplastic" "texturename" "checkerboard.txr"
!  ReadArchive "vase.rib"
  
  WorldEnd

--- NEW FILE: testNu3.rib ---
Display "testNu3" "framebuffer" "rgba"
PixelFilter "gaussian" 2 2
Format 300 300 1
PixelSamples 4 4
Exposure 1 2.2
Projection "perspective" "fov" [10]
Translate 0 0 40
WorldBegin
LightSource "distantlight" 1 "from" [1 1 -1] "to" [0 0 0] "intensity" 1
LightSource "ambientlight" 2 "intensity" 0.05
 ShadingRate .25

AttributeBegin
Translate -2.2 1.9 0
Surface "noisetest" "uniform float noisescale" 4 "uniform integer noiseoctaves" 1
Color 1 1 1
 Rotate 210 1 0 0
Scale .15 .15 .15
 ReadArchive "vase.rib"
AttributeEnd

AttributeBegin
Translate 0 1.9 0
Surface "noisetest" "uniform float noisescale" 2 "uniform integer noiseoctaves" 5
Color 1 1 1
 Rotate 210 1 0 0
Scale .15 .15 .15
 ReadArchive "vase.rib"
AttributeEnd

AttributeBegin
Translate 2.2 1.9 0
Surface "turbulence" "uniform float noisescale" 2 "uniform integer noiseoctaves" 5
Color 1 1 1
 Rotate 210 1 0 0
Scale .15 .15 .15
 ReadArchive "vase.rib"
AttributeEnd

AttributeBegin
Translate -2.2 -.4 0
Surface "matte"
Displacement "noisetest" "uniform float noisescale" 2 "uniform integer noiseoctaves" 4 "uniform float Km" 0.3
Attribute "displacementbound" "sphere" 0.3
Color 1 1 1
 Rotate 210 1 0 0
Scale .15 .15 .15
 ReadArchive "vase.rib"
AttributeEnd

AttributeBegin
Translate 0 -.4 0
Surface "matte"
Displacement "dented" "uniform float noisescale" 2 "uniform integer noiseoctaves" 6 "uniform float Km" 0.3
Color 1 1 1
Rotate 210 1 0 0
Scale .15 .15 .15
 ReadArchive "vase.rib"
AttributeEnd

AttributeBegin
Translate 2.2 -.4 0
Surface "matte"
Displacement "turbulence" "uniform float noisescale" 2 "uniform integer noiseoctaves" 4 "uniform float Km" 0.3
Attribute "displacementbound" "sphere" 0.3
Color 1 1 1
 Rotate 210 1 0 0
Scale .15 .15 .15
 ReadArchive "vase.rib"
AttributeEnd

AttributeBegin
Translate -2.2 -2.7 0
Surface "randomcheckers" "uniform float noisescale" 10
Color 1 1 1
 Rotate 210 1 0 0
Scale .15 .15 .15
 ReadArchive "vase.rib"
AttributeEnd

AttributeBegin
Translate 0 -2.7 0
Surface "confetti" "uniform float noisescale" 4
Color 1 1 1
 Rotate 210 1 0 0
Scale .15 .15 .15
 ReadArchive "vase.rib"
AttributeEnd

AttributeBegin
Translate 2.2 -2.7 0
Surface "confetti" "uniform float noisescale" 4
Displacement "dented" "uniform float noisescale" 3 "uniform integer noiseoctaves" 4 "uniform float Km" 0.3
Color 1 1 1
 Rotate 210 1 0 0
Scale .15 .15 .15
 ReadArchive "vase.rib"
AttributeEnd


WorldEnd


Index: testNu2.rib
===================================================================
RCS file: /cvsroot/jrman/drafts/sampleData/testNu2.rib,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** testNu2.rib	4 Nov 2004 03:11:28 -0000	1.1
--- testNu2.rib	7 Nov 2004 22:42:18 -0000	1.2
***************
*** 1,3 ****
! Display "testNu" "framebuffer" "rgba"
  PixelFilter "gaussian" 2 2
  Format 300 300 1
--- 1,3 ----
! Display "testNu2" "framebuffer" "rgba"
  PixelFilter "gaussian" 2 2
  Format 300 300 1
***************
*** 9,16 ****
   #Rotate 90 0 0 1
   Rotate 230 1 0 0
!  LightSource "distantlight" 1 "intensity" [0.8] "from" [-10 -10 10] "to" [0 0 0]
   ShadingRate .25
   Color .3 .5 1
! # Surface "paintedplastic" "texturename" "checkerboard.txr"
  
  NuPatch 9 3 [ 0 0 0 1 1 2 2 3 3 4 4 4 ] 0 4
--- 9,16 ----
   #Rotate 90 0 0 1
   Rotate 230 1 0 0
!  LightSource "distantlight" 1 "intensity" [0.8] "from" [10 10 10] "to" [0 0 0]
   ShadingRate .25
   Color .3 .5 1
!  Surface "paintedplastic" "texturename" "checkerboard.txr"
  
  NuPatch 9 3 [ 0 0 0 1 1 2 2 3 3 4 4 4 ] 0 4

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

From: Elmer G. <ega...@us...> - 2004-11-04 03:11:39

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

Modified Files:
	Nurbs.java 
Log Message:
Fixed two nurbs bug and cleaned the code.

Index: Nurbs.java
===================================================================
RCS file: /cvsroot/jrman/drafts/src/org/jrman/primitive/Nurbs.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Nurbs.java	13 Oct 2004 06:18:11 -0000	1.4
--- Nurbs.java	4 Nov 2004 03:11:28 -0000	1.5
***************
*** 22,25 ****
--- 22,28 ----
  import javax.vecmath.Point3f;
  import javax.vecmath.Point4f;
+ import javax.vecmath.Tuple3f;
+ import javax.vecmath.Tuple4f;
+ import javax.vecmath.Vector3f;
  
  import org.jrman.attributes.Attributes;
***************
*** 28,31 ****
--- 31,35 ----
  import org.jrman.grid.Grid;
  import org.jrman.grid.Point3fGrid;
+ import org.jrman.grid.Vector3fGrid;
  import org.jrman.parameters.Declaration;
  import org.jrman.parameters.ParameterList;
***************
*** 33,43 ****
  import org.jrman.parameters.VaryingScalarTuple3f;
  import org.jrman.render.ShaderVariables;
- import org.jrman.util.Calc;
  
  public class Nurbs extends Primitive {
  
-     /* Size, in pixels of facets produced */
-     private final static float SUBDIV_TOLERANCE = 2.0F;
- 
      /* Used to determine when things are too small. */
      private final static float EPSILON = 0.0000001F;
--- 37,43 ----
***************
*** 67,70 ****
--- 67,74 ----
      
      private boolean dirflag = true;
+ 
+     private float[] newkv;
+ 
+     private int splitPt;
      
      /* Control points, indexed as points[0..numV-1][0..numU-1] */
***************
*** 82,90 ****
      private boolean strUn;
  
-     /* Surface flatness flags for subdivision */
-     private boolean flatV;
- 
-     private boolean flatU;
- 
      /* Corner data structures for subdivision */
      private SurfSample c00 = new SurfSample();
--- 86,89 ----
***************
*** 98,108 ****
      private static Point3f tmp = new Point3f();
  
-  //   private static Point4f P = new Point4f();
-     
-     //public Nurbs() {
-     //}
- 
      public Nurbs(int nu, int uorder, float[] uknot, float umin, float umax,
!             int nv, int vorder, float[] vknot, float vmin, float vmax,
              ParameterList parameters, Attributes attributes) {       
          super(parameters, attributes);
--- 97,102 ----
      private static Point3f tmp = new Point3f();
  
      public Nurbs(int nu, int uorder, float[] uknot, float umin, float umax,
!             int nv, int vorder, float[] vknot, float vmin, float vmax, boolean dirflag,
              ParameterList parameters, Attributes attributes) {       
          super(parameters, attributes);
***************
*** 117,124 ****
          this.vmin = vmin;
          this.vmax = vmax;
!         
          extractPoints(parameters);
      }
      
      public BoundingVolume getBoundingVolume() {
          ConvexHull3f ch = new ConvexHull3f();
--- 111,126 ----
          this.vmin = vmin;
          this.vmax = vmax;
!         this.dirflag = !dirflag;
          extractPoints(parameters);
      }
      
+ 
+     public Nurbs(int nu, int uorder, float[] uknot, float umin, float umax,
+             int nv, int vorder, float[] vknot, float vmin, float vmax,
+             ParameterList parameters, Attributes attributes) {       
+         this(nu, uorder, uknot, umin, umax, nv, vorder, vknot, vmin, vmax,
+               true, parameters, attributes);
+     }
+     
      public BoundingVolume getBoundingVolume() {
          ConvexHull3f ch = new ConvexHull3f();
***************
*** 194,200 ****
          strUn = parent.strUn;
  
-         flatV = parent.flatV;
-         flatU = parent.flatU;
- 
          //c00 = new SurfSample(parent.c00);
          //c0n = new SurfSample(parent.c0n);
--- 196,199 ----
***************
*** 213,235 ****
      }
  
!     private float[] newkv;
! 
!     private int splitPt;
! 
!  /*   private float max(float a, float b) {
!         return (a > b) ? a : b;
!     }*/
! 
!     private int max(int a, int b) {
!         return (a > b) ? a : b;
!     }
! 
!     private int min(int a, int b) {
!         return (a < b) ? a : b;
!     }
! 
!     private final static int MAXORDER = 20;
! 
!     private void divW(Point4f rpt, Point3f pt) {
          pt.x = rpt.x / rpt.w;
          pt.y = rpt.y / rpt.w;
--- 212,216 ----
      }
  
!     private void divW(Tuple4f rpt, Tuple3f pt) {
          pt.x = rpt.x / rpt.w;
          pt.y = rpt.y / rpt.w;
***************
*** 237,256 ****
      }
  
-     private void divPoint(Point3f p, float dn) {
-         p.x /= dn;
-         p.y /= dn;
-         p.z /= dn;
-     }
- 
-     private Point4f getPoint(int i, int crvInd, boolean dirflag) {
-         return dirflag ? points[crvInd][i] : points[i][crvInd];
-     }
- 
-     private void screenProject(Point4f worldPt, Point3f screenPt) {
-         screenPt.x = worldPt.x / worldPt.w * 100 + 200;
-         screenPt.y = worldPt.y / worldPt.w * 100 + 200;
-         screenPt.z = worldPt.z / worldPt.w * 100 + 200;
-     }
- 
      /*
       * Compute the normal of a corner point of a mesh. The base is the value of
--- 218,221 ----
***************
*** 259,264 ****
       */
      private void getNormal(int indV, int indU) {
!         Point3f tmpL = new Point3f();
!         Point3f tmpR = new Point3f(); /* "Left" and "Right" of the base point */
  
          SurfSample crnr;
--- 224,229 ----
       */
      private void getNormal(int indV, int indU) {
!         Vector3f tmpL = new Vector3f();
!         Vector3f tmpR = new Vector3f(); /* "Left" and "Right" of the base point */
  
          SurfSample crnr;
***************
*** 280,286 ****
          }
  
!         v3Sub(tmpL, crnr.point, tmpL);
!         v3Sub(tmpR, crnr.point, tmpR);
!         v3Cross(tmpL, tmpR, crnr.normal);
          adjustNormal(crnr);
      }
--- 245,251 ----
          }
  
!         tmpL.sub(crnr.point);
!         tmpR.sub(crnr.point);  
!         crnr.normal.cross(tmpL, tmpR);
          adjustNormal(crnr);
      }
***************
*** 292,301 ****
      private void adjustNormal(SurfSample samp) {
          /* If it's not degenerate, do the normalization now */
!         samp.normLen = v3Length(samp.normal);
  
          if (samp.normLen < EPSILON)
              samp.normLen = 0.0F;
          else
!             divPoint(samp.normal, samp.normLen);
      }
  
--- 257,266 ----
      private void adjustNormal(SurfSample samp) {
          /* If it's not degenerate, do the normalization now */
!         samp.normLen = samp.normal.length();
  
          if (samp.normLen < EPSILON)
              samp.normLen = 0.0F;
          else
!             samp.normal.scale(samp.normLen);
      }
  
***************
*** 313,317 ****
       */
  
!     private void splitSurface(Nurbs kid0, Nurbs kid1, boolean dirflag) {
          /* 
           * Add a multiplicty k knot to the knot vector in the direction
--- 278,282 ----
       */
  
!     private void splitSurface(Nurbs kid0, Nurbs kid1) {
          /* 
           * Add a multiplicty k knot to the knot vector in the direction
***************
*** 358,362 ****
          for (int i = 0; i < kid0.vorder + kid0.nv; i++)
              kid0.vknot[i] = tmp.vknot[i];
! 
          /* Second half */
  
--- 323,330 ----
          for (int i = 0; i < kid0.vorder + kid0.nv; i++)
              kid0.vknot[i] = tmp.vknot[i];
!         kid0.umin = kid0.uknot[uorder -1];
!         kid0.umax = kid0.uknot[nu];
!         kid0.vmin = kid0.vknot[vorder -1];
!         kid0.vmax = kid0.vknot[nv];
          /* Second half */
  
***************
*** 376,379 ****
--- 344,351 ----
          for (int i = 0; i < kid1.vorder + kid1.nv; i++)
              kid1.vknot[i] = tmp.vknot[dirflag ? i : (i + splitPt)];
+         kid1.umin = kid1.uknot[uorder -1];
+         kid1.umax = kid1.uknot[nu];
+         kid1.vmin = kid1.vknot[vorder -1];
+         kid1.vmax = kid1.vknot[nv];
  
          /* Construct new corners on the boundry between the two kids */
***************
*** 445,458 ****
       */
      private void projectToLine(Point3f firstPt, Point3f lastPt, Point3f midPt) {
!         Point3f v0 = new Point3f();
!         Point3f vm = new Point3f();
  
          Point3f base = firstPt;
  
!         v3Sub(lastPt, base, v0);
!         v3Sub(midPt, base, vm);
  
!         float denom = v3SquaredLength(v0);
!         float fraction = (denom == 0.0) ? 0.0F : (v3Dot(v0, vm) / denom);
  
          midPt.x = base.x + fraction * v0.x;
--- 417,430 ----
       */
      private void projectToLine(Point3f firstPt, Point3f lastPt, Point3f midPt) {
!         Vector3f v0 = new Vector3f();
!         Vector3f vm = new Vector3f();
  
          Point3f base = firstPt;
  
!         v0.sub(lastPt, base);
!         vm.sub(midPt, base);
  
!         float denom = v0.lengthSquared();
!         float fraction = (denom == 0.0) ? 0.0F : (v0.dot(vm) / denom);
  
          midPt.x = base.x + fraction * v0.x;
***************
*** 522,651 ****
      }
  
!     /*
!      * Check to see if a surface is flat. Tests are only performed on edges and
!      * directions that aren't already straight. If an edge is flagged as
!      * straight (from the parent surface) it is assumed it will stay that way.
!      */
!     private boolean testFlat(float tolerance) {
!         Point3f cp00 = new Point3f(); //by reference
!         Point3f cp0n = new Point3f();
!         Point3f cpn0 = new Point3f();
!         Point3f cpnn = new Point3f();
!         Point3f planeEqn = new Point3f();
! 
!         /* Check edge straightness */
! 
!         if (!strU0)
!             strU0 = isCurveStraight(tolerance, 0, false);
!         if (!strUn)
!             strUn = isCurveStraight(tolerance, (nu - 1), false);
!         if (!strV0)
!             strV0 = isCurveStraight(tolerance, 0, true);
!         if (!strVn)
!             strVn = isCurveStraight(tolerance, (nv - 1), true);
! 
!         /* Test to make sure control points are straight in U and V */
! 
!         boolean straight = true;
!         if (!flatU && strV0 && strVn)
!             for (int i = 1; (i < (nv - 1))
!                     && (straight = isCurveStraight(tolerance, i, true)); i++);
! 
!         if (straight && strV0 && strVn)
!             flatU = true;
! 
!         straight = true;
!         if (!flatV && strU0 && strUn)
!             for (int i = 1; (i < (nu - 1))
!                     && (straight = isCurveStraight(tolerance, i, false)); i++)
!                 ;
! 
!         if (straight && strU0 && strUn)
!             flatV = true;
! 
!         if (!flatV || !flatU)
!             return false;
! 
!         /* The surface can pass the above tests but still be twisted. */
! 
!         screenProject(points[0][0], cp00);
!         screenProject(points[0][(nu - 1)], cp0n);
!         screenProject(points[(nv - 1)][0], cpn0);
!         screenProject(points[(nv - 1)][(nu - 1)], cpnn);
! 
!         v3Sub(cp0n, cp00, cp0n); /* Make edges into vectors */
!         v3Sub(cpn0, cp00, cpn0);
! 
!         /*
!          * Compute the plane equation from two adjacent sides, and measure the
!          * distance from the far point to the plane. If it's larger than
!          * tolerance, the surface is twisted.
!          */
! 
!         v3Cross(cpn0, cp0n, planeEqn);
! 
!         v3Normalize(planeEqn); /* Normalize to keep adds in sync w/ mults */
! 
!         float d = v3Dot(planeEqn, cp00);
!         float dist = Math.abs(v3Dot(planeEqn, cpnn) - d);
! 
!         return (dist > tolerance) ? false : true; /* Surface is twisted */
!     }
! 
!     private boolean isCurveStraight(double tolerance, int crvInd,
!             boolean dirflag)
!     /* If true, test in U direction, else test in V */
!     {
!         Point3f p = new Point3f();
!         Point3f vec = new Point3f();
!         Point3f prod = new Point3f();
!         Point3f cp = new Point3f(); // by reference
!         Point3f e0 = new Point3f();
! 
!         /* Special case: lines are automatically straight. */
!         if ((dirflag ? nu : nv) == 2)
!             return true;
! 
!         int last = (dirflag ? nu : nv) - 1;
!         screenProject(getPoint(0, crvInd, dirflag), e0);
! 
!         /*
!          * Form an initial line to test the other points against (skiping degen
!          * lines)
!          */
! 
!         float linelen = 0.0F;
!         for (int i = last; (i > 0) && (linelen < EPSILON); i--) {
!             screenProject(getPoint(i, crvInd, dirflag), cp);
!             v3Sub(cp, e0, vec);
! 
!             linelen = v3Length(vec);
!         }
! 
!         divPoint(vec, linelen);
! 
!         if (linelen > EPSILON) /*
!                                 * If no non-degenerate lines found, it's all
!                                 * degen
!                                 */
!             for (int i = 1; i <= last; i++) {
!                 /*
!                  * The cross product of the vector defining the initial line
!                  * with the vector of the current point gives the distance to
!                  * the line.
!                  */
!                 screenProject(getPoint(i, crvInd, dirflag), cp);
!                 v3Sub(cp, e0, p);
! 
!                 v3Cross(p, vec, prod);
!                 float dist = v3Length(prod);
! 
!                 if (dist > tolerance)
!                     return false;
!             }
! 
!         return true;
!     }
! 
      /*
       * If a normal has collapsed to zero (normLen == 0.0) then try and fix it by
--- 494,499 ----
      }
  
!     
!   
      /*
       * If a normal has collapsed to zero (normLen == 0.0) then try and fix it by
***************
*** 656,660 ****
          boolean goodnorm = false;
          SurfSample[] V = new SurfSample[3];
!         Point3f norm = new Point3f();
          int ok;
  
--- 504,508 ----
          boolean goodnorm = false;
          SurfSample[] V = new SurfSample[3];
!         Vector3f norm = new Vector3f();
          int ok;
  
***************
*** 682,690 ****
                          * (V[i].point.y + V[j].point.y);
              }
!             float dist = v3Length(norm);
              if (dist == 0.0)
                  return; /* This sucker's hopeless... */
  
!             divPoint(norm, dist);
  
              for (int i = 0; i < 3; i++) {
--- 530,538 ----
                          * (V[i].point.y + V[j].point.y);
              }
!             float dist = norm.length();
              if (dist == 0.0)
                  return; /* This sucker's hopeless... */
  
!             norm.scale(dist);
  
              for (int i = 0; i < 3; i++) {
***************
*** 701,800 ****
      }
  
-  //   private void lineTriangle(SurfSample v0, SurfSample v1, SurfSample v2) {
-         //moveTo((int) (v0.point.x * 100 + 200), (int) (v0.point.y * 100 +
-         // 200));
-         //lineTo((int) (v1.point.x * 100 + 200), (int) (v1.point.y * 100 +
-         // 200));
-         //lineTo((int) (v2.point.x * 100 + 200), (int) (v2.point.y * 100 +
-         // 200));
-         //lineTo((int) (v0.point.x * 100 + 200), (int) (v0.point.y * 100 +
-         // 200));
-    // }
- 
- /*    private void emitTriangles(Nurbs n) {
-         Point3f vecnn = new Point3f();
-         Point3f vec0n = new Point3f(); // Diagonal vectors 
- 
-         //
-         // Measure the distance along the two diagonals to decide the best way
-         // to cut the rectangle into triangles.
-         //
- 
-         v3Sub(n.c00.point, n.cnn.point, vecnn);
-         v3Sub(n.c0n.point, n.cn0.point, vec0n);
- 
-         float len2nn = v3SquaredLength(vecnn); // Use these to reject triangles 
-         float len20n = v3SquaredLength(vec0n); // that are too small to render 
- 
-         if (max(len2nn, len20n) < EPSILON)
-             return; // Triangles are too small to render 
- 
-         //
-         // Assign the texture coordinates
-         //
-         float u0 = n.uknot[n.uorder - 1];
-         float un = n.uknot[n.nu];
-         float v0 = n.vknot[n.vorder - 1];
-         float vn = n.vknot[n.nv];
-         n.c00.u = u0;
-         n.c00.v = v0;
-         n.c0n.u = un;
-         n.c0n.v = v0;
-         n.cn0.u = u0;
-         n.cn0.v = vn;
-         n.cnn.u = un;
-         n.cnn.v = vn;
- 
-         //
-         // If any normals are sick, fix them now.
-         //
-         if ((n.c00.normLen == 0.0) || (n.cnn.normLen == 0.0)
-                 || (n.cn0.normLen == 0.0))
-             fixNormals(n.c00, n.cnn, n.cn0);
-         if (n.c0n.normLen == 0.0)
-             fixNormals(n.c00, n.c0n, n.cnn);
- 
-         if (len2nn < len20n) {
-             lineTriangle(n.c00, n.cnn, n.cn0);
-             lineTriangle(n.c00, n.c0n, n.cnn);
-         } else {
-             lineTriangle(n.c0n, n.cnn, n.cn0);
-             lineTriangle(n.c0n, n.cn0, n.c00);
-         }
-     }
- */
-     private float v3SquaredLength(Point3f a) {
-         return ((a.x * a.x) + (a.y * a.y) + (a.z * a.z));
-     }
- 
-     private float v3Length(Point3f a) {
-         return (float) Math.sqrt(v3SquaredLength(a));
-     }
- 
-     private float v3Dot(Point3f a, Point3f b) {
-         return ((a.x * b.x) + (a.y * b.y) + (a.z * b.z));
-     }
- 
-     private void v3Normalize(Point3f v) {
-         float len = v3Length(v);
-         if (len != 0.0) {
-             v.x /= len;
-             v.y /= len;
-             v.z /= len;
-         }
-     }
- 
-     private void v3Cross(Point3f a, Point3f b, Point3f c) {
-         c.x = (a.y * b.z) - (a.z * b.y);
-         c.y = (a.z * b.x) - (a.x * b.z);
-         c.z = (a.x * b.y) - (a.y * b.x);
-     }
- 
-     private void v3Sub(Point3f a, Point3f b, Point3f c) {
-         c.x = a.x - b.x;
-         c.y = a.y - b.y;
-         c.z = a.z - b.z;
-     }
- 
      /*
       * Given the original knot vector ukv, and a new knotvector vkv, compute the
--- 549,552 ----
***************
*** 805,809 ****
       */
      private float[][] calcAlpha(float[] ukv, float[] wkv, int m, int n, int k) {
!         float[] aval = new float[MAXORDER];
          float[][] alpha = new float[k + 1][m + n + 1];
  
--- 557,561 ----
       */
      private float[][] calcAlpha(float[] ukv, float[] wkv, int m, int n, int k) {
!         float[] aval = new float[k];
          float[][] alpha = new float[k + 1][m + n + 1];
  
***************
*** 813,817 ****
              for (int r = 2; r <= k; r++) {
                  int rm1 = r - 1;
!                 int last = min(rm1, brkPoint);
                  int i = brkPoint - last;
                  if (last < rm1)
--- 565,569 ----
              for (int r = 2; r <= k; r++) {
                  int rm1 = r - 1;
!                 int last = Math.min(rm1, brkPoint);
                  int i = brkPoint - last;
                  if (last < rm1)
***************
*** 829,833 ****
                  }
              }
!             int last = min(k - 1, brkPoint);
              for (int i = 0; i <= k; i++)
                  alpha[i][j] = 0.0F;
--- 581,585 ----
                  }
              }
!             int last = Math.min(k - 1, brkPoint);
              for (int i = 0; i <= k; i++)
                  alpha[i][j] = 0.0F;
***************
*** 878,887 ****
                      dp = dest.points[out][j];
                      brkPoint = findBreakPoint(dest.uknot[j], uknot, nu - 1, uorder);
!                     i1 = max(brkPoint - uorder + 1, 0);
                      sp = points[out][i1];
                  } else {
                      dp = dest.points[j][out];
                      brkPoint = findBreakPoint(dest.vknot[j], vknot, nv - 1, vorder);
!                     i1 = max(brkPoint - vorder + 1, 0);
                      sp = points[i1][out];
                  }
--- 630,639 ----
                      dp = dest.points[out][j];
                      brkPoint = findBreakPoint(dest.uknot[j], uknot, nu - 1, uorder);
!                     i1 = Math.max(brkPoint - uorder + 1, 0);
                      sp = points[out][i1];
                  } else {
                      dp = dest.points[j][out];
                      brkPoint = findBreakPoint(dest.vknot[j], vknot, nv - 1, vorder);
!                     i1 = Math.max(brkPoint - vorder + 1, 0);
                      sp = points[i1][out];
                  }
***************
*** 930,934 ****
          Point3f point = new Point3f();
  
!         Point3f normal = new Point3f();
  
          /* Used for normalizing normals */
--- 682,686 ----
          Point3f point = new Point3f();
  
!         Vector3f normal = new Vector3f();
  
          /* Used for normalizing normals */
***************
*** 948,973 ****
      public Primitive[] split() {
          Nurbs[] result = new Nurbs[2];
-        // if (testFlat(n, tolerance)) {
-        //     emitTriangles(n);
-        // } else {
-         testFlat(SUBDIV_TOLERANCE);
-         if ((!flatV && !flatU) || (flatV && flatU))
-             dirflag = !dirflag; /* If twisted or curved in both directions, */
-         else /* then alternate subdivision direction */
-         {
-             if (flatU) /* Only split in directions that aren't flat */
-                 dirflag = false;
-             else
-                 dirflag = true;
-         }
          result[0] = new Nurbs(nu, uorder, uknot, umin, umax,
!                 nv, vorder, vknot, vmin, vmax, parameters, attributes);
          result[1] = new Nurbs(nu, uorder, uknot, umin, umax,
!                 nv, vorder, vknot, vmin, vmax, parameters, attributes);
!         splitSurface(result[0], result[1], dirflag);
!         //doSubdivision(left, tolerance, dirflag, level + 1);
!         //doSubdivision(right, tolerance, dirflag, level + 1);
!         //}
!         //doSubdivision(this, SUBDIV_TOLERANCE, true, 0);
          result[0].setObjectToCamera(objectToCamera);
          result[1].setObjectToCamera(objectToCamera);
--- 700,708 ----
      public Primitive[] split() {
          Nurbs[] result = new Nurbs[2];
          result[0] = new Nurbs(nu, uorder, uknot, umin, umax,
!                 nv, vorder, vknot, vmin, vmax, dirflag, parameters, attributes);
          result[1] = new Nurbs(nu, uorder, uknot, umin, umax,
!                 nv, vorder, vknot, vmin, vmax, dirflag, parameters, attributes);
!         splitSurface(result[0], result[1]);
          result[0].setObjectToCamera(objectToCamera);
          result[1].setObjectToCamera(objectToCamera);
***************
*** 976,979 ****
--- 711,716 ----
      
      protected void dice_P(ShaderVariables shaderVariables) {
+         //System.out.println("dice");
+         
          /*
           * If any normals are sick, fix them now.
***************
*** 988,1011 ****
          int vSize = Grid.getVSize();
          Point3fGrid P = shaderVariables.P;
          
          /* Compute points on curve */
- 
          for (int u = 0; u < uSize; u++) {
!             float vPos = ( u /(float) uSize)
!                 * (vknot[nv] - vknot[vorder - 1])
!                 + vknot[vorder - 1];
              for (int v = 0; v < vSize; v++) {
!                 float uPos = (v / (float) vSize)
!                     * (uknot[nu] - uknot[uorder - 1])
!                     + uknot[uorder - 1];
!              
!                 Point3f n = new Point3f();
!                 Point3f utan = new Point3f();
!                 Point3f vtan = new Point3f();
                  
                  calcPoint( uPos, vPos, tmp, utan, vtan );
                  P.set(u, v, tmp);
!                 /*v3Cross(utan, vtan, n );
!                 float d = v3Length( n );
                  if (d != 0.0)
                  {
--- 725,748 ----
          int vSize = Grid.getVSize();
          Point3fGrid P = shaderVariables.P;
+         Vector3fGrid Ng = shaderVariables.Ng;
          
          /* Compute points on curve */
          for (int u = 0; u < uSize; u++) {
!             float uPos = ( u /(float) uSize)
!                 * (uknot[nu] - uknot[uorder - 1])
!                 + uknot[uorder - 1];
              for (int v = 0; v < vSize; v++) {
!                 float vPos = (v / (float) vSize)
!                     * (vknot[nv] - vknot[vorder - 1])
!                     + vknot[vorder - 1];
!                 Vector3f n = new Vector3f();
!                 Vector3f utan = new Vector3f();
!                 Vector3f vtan = new Vector3f();
                  
                  calcPoint( uPos, vPos, tmp, utan, vtan );
                  P.set(u, v, tmp);
! 
!                 n.cross(utan, vtan);
!                 float d = n.length();
                  if (d != 0.0)
                  {
***************
*** 1020,1025 ****
                      n.z = 0;
                  }
!                 pts[i][j].normLen = d;
!                 pts[i][j].normal = n;*/
                  //pts[i][j].u = u;
                  //pts[i][j].v = v;
--- 757,764 ----
                      n.z = 0;
                  }
! 
!                 Ng.set(u, v, n);
!                 //pts[i][j].normLen = d;
!                 //pts[i][j].normal = n;
                  //pts[i][j].u = u;
                  //pts[i][j].v = v;
***************
*** 1029,1067 ****
  
      protected void dice_Ng(ShaderVariables sv) {
!         sv.Ng.cross(sv.dPdu, sv.dPdv);
      }
      
!     /*public Primitive[] split() {
!         Primitive[] result = new Primitive[2];
!         extractPoints();
!         vtmp.sub(P30, P00);
!         float l1 = vtmp.length();
!         vtmp.sub(P33, P03);
!         float l2 = vtmp.length();
!         float ul = (l1 + l2) / 2f;
!         vtmp.sub(P03, P00);
!         l1 = vtmp.length();
!         vtmp.sub(P33, P30);
!         l2 = vtmp.length();
!         float vl = (l1 + l2) / 2f;
!         if (ul > vl) {
!             result[0] =
!                 new BicubicPatch(bezierInterpolateParameters(0f, .5f, 0f, 1f), attributes, false);
!             result[1] =
!                 new BicubicPatch(bezierInterpolateParameters(.5f, 1f, 0f, 1f), attributes, false);
!             result[0].setObjectToCamera(objectToCamera);
!             result[1].setObjectToCamera(objectToCamera);
!         } else {
!             result[0] =
!                 new BicubicPatch(bezierInterpolateParameters(0f, 1f, 0f, .5f), attributes, false);
!             result[1] =
!                 new BicubicPatch(bezierInterpolateParameters(0f, 1f, .5f, 1f), attributes, false);
!             result[0].setObjectToCamera(objectToCamera);
!             result[1].setObjectToCamera(objectToCamera);
!         }
!         return result;
!     }*/
!     
! 
      
      /*
--- 768,775 ----
  
      protected void dice_Ng(ShaderVariables sv) {
!         //sv.Ng.cross(sv.dPdu, sv.dPdv);
      }
      
!    
      
      /*
***************
*** 1076,1092 ****
       */
  
!     private void basisFunctions( float u, int brkPoint, 
!             float[] kv, int k, float[] bvals ) {
          bvals[0] = 1.0F;
!         for (int r = 2; r <= k; r++)
!         {
              int i = brkPoint - r + 1;
              bvals[r - 1] = 0.0F;
!             for (int s = r-2; s >= 0; s--)
!             {
                  i++;
! 
!                 float omega = 0;
!                 if (i >= 0)
                      omega = (u - kv[i]) / (kv[i + r - 1] - kv[i]);
                  bvals[s + 1] = bvals[s + 1] + (1 - omega) * bvals[s];
--- 784,799 ----
       */
  
!     private void basisFunctions( float u, int brkPoint, float[] kv, 
!             int k, float[] bvals ) {
          bvals[0] = 1.0F;
!         for (int r = 2; r <= k; r++) {
              int i = brkPoint - r + 1;
              bvals[r - 1] = 0.0F;
!             for (int s = r-2; s >= 0; s--) {
                  i++;
!                 float omega;
!                 if (i < 0)
!                     omega = 0;
!                 else
                      omega = (u - kv[i]) / (kv[i + r - 1] - kv[i]);
                  bvals[s + 1] = bvals[s + 1] + (1 - omega) * bvals[s];
***************
*** 1116,1120 ****
      }
  
!     private void calcPoint(float u, float v, Point3f p, Point3f utan, Point3f vtan) {
          float[] bu = new float[uorder];
          float[] buprime = new float[uorder];
--- 823,827 ----
      }
  
!     private void calcPoint(float u, float v, Point3f p, Vector3f utan, Vector3f vtan) {
          float[] bu = new float[uorder];
          float[] buprime = new float[uorder];
***************
*** 1124,1127 ****
--- 831,838 ----
          Point4f rutan = new Point4f();
          Point4f rvtan = new Point4f(); 
+         if (!(uknot[uorder - 1]  <= u) || !(u < uknot[nu]))
+             System.out.println(uknot[uorder - 1] + "<=" + u + "<" + uknot[nu]); 
+         if (!(vknot[vorder - 1]  <= v) || !(v < vknot[nv]))
+             System.out.println(vknot[vorder - 1] + "<=" + v + "<" + vknot[nv]);
  
          // Evaluate non-uniform basis functions (and derivatives) 
***************
*** 1139,1145 ****
              basisDerivatives( v, vbrkPoint, vknot, vorder, bvprime );
          // Weight control points against the basis functions 
! 
          for (int i = 0; i < vorder; i++)
!             for (int j = 0; j < vorder; j++)
              {
                  int ri = vorder - 1 - i;
--- 850,856 ----
              basisDerivatives( v, vbrkPoint, vknot, vorder, bvprime );
          // Weight control points against the basis functions 
!         
          for (int i = 0; i < vorder; i++)
!             for (int j = 0; j < uorder; j++)
              {
                  int ri = vorder - 1 - i;

Flat | Threaded

<< < 1 .. 6 7 8 9 10 .. 41 > >> (Page 8 of 41)

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