Menu
▾
▴
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
|
Update of /cvsroot/jrman/drafts/src/org/jrman/parameters In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv30032/src/org/jrman/parameters Modified Files: Declaration.java Parameter.java ParameterList.java UniformArrayFloat.java UniformArrayHPoint.java UniformArrayInteger.java UniformArrayString.java UniformArrayTuple3f.java UniformScalarFloat.java UniformScalarHPoint.java UniformScalarInteger.java UniformScalarString.java UniformScalarTuple3f.java VaryingArrayFloat.java VaryingArrayHPoint.java VaryingArrayTuple3f.java VaryingScalarFloat.java VaryingScalarHPoint.java VaryingScalarTuple3f.java Log Message: Started working on curves. Index: UniformScalarTuple3f.java =================================================================== RCS file: /cvsroot/jrman/drafts/src/org/jrman/parameters/UniformScalarTuple3f.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** UniformScalarTuple3f.java 8 Apr 2004 21:03:32 -0000 1.5 --- UniformScalarTuple3f.java 24 Dec 2006 05:25:56 -0000 1.6 *************** *** 1,19 **** /* ! UniformScalarTuple3f.java ! Copyright (C) 2003, 2004 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. */ --- 1,19 ---- /* ! UniformScalarTuple3f.java ! Copyright (C) 2003, 2004, 2006 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. */ *************** *** 45,54 **** } ! public Parameter linearInterpolate(float uMin, float uMax, float vMin, float vMax) { return this; } public void linearDice(Grid grid) { ! throw new UnsupportedOperationException("Parameter not diceable: " + declaration); } --- 45,65 ---- } ! public Parameter linearInterpolate(float min, float max) { ! return this; ! } ! ! public Parameter bilinearInterpolate(float uMin, float uMax, ! float vMin, float vMax) { return this; } public void linearDice(Grid grid) { ! throw new UnsupportedOperationException("Parameter not diceable: " + ! declaration); ! } ! ! public void bilinearDice(Grid grid) { ! throw new UnsupportedOperationException("Parameter not diceable: " + ! declaration); } Index: Declaration.java =================================================================== RCS file: /cvsroot/jrman/drafts/src/org/jrman/parameters/Declaration.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Declaration.java 4 Jul 2005 06:32:05 -0000 1.8 --- Declaration.java 24 Dec 2006 05:25:56 -0000 1.9 *************** *** 1,19 **** /* ! Declaration.java ! Copyright (C) 2003 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. */ --- 1,19 ---- /* ! Declaration.java ! Copyright (C) 2003 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. */ *************** *** 39,43 **** public static class StorageClass { ! public static final StorageClass CONSTANT = new StorageClass("constant"); public static final StorageClass UNIFORM = new StorageClass("uniform"); --- 39,44 ---- public static class StorageClass { ! public static final StorageClass CONSTANT = ! new StorageClass("constant"); public static final StorageClass UNIFORM = new StorageClass("uniform"); *************** *** 65,69 **** StorageClass result = (StorageClass) map.get(name); if (result == null) ! throw new IllegalArgumentException("No such storage class: " + name); return result; } --- 66,71 ---- StorageClass result = (StorageClass) map.get(name); if (result == null) ! throw new IllegalArgumentException("No such storage class: " + ! name); return result; } *************** *** 122,126 **** Type result = (Type) map.get(name); if (result == null) ! throw new IllegalArgumentException("No such data type: " + name); return result; } --- 124,129 ---- Type result = (Type) map.get(name); if (result == null) ! throw new IllegalArgumentException("No such data type: " + ! name); return result; } *************** *** 132,136 **** } ! public Declaration(String name, StorageClass storageClass, Type type, int count) { this.name = name.intern(); this.storageClass = storageClass; --- 135,140 ---- } ! public Declaration(String name, StorageClass storageClass, Type type, ! int count) { this.name = name.intern(); this.storageClass = storageClass; *************** *** 230,234 **** } ! public Parameter buildParameter(float[] numbers, String[] strings, int arraySize) { if (type == Type.FLOAT) { if (storageClass == StorageClass.CONSTANT) { --- 234,239 ---- } ! public Parameter buildParameter(float[] numbers, String[] strings, ! int arraySize) { if (type == Type.FLOAT) { if (storageClass == StorageClass.CONSTANT) { *************** *** 236,240 **** return new UniformScalarFloat(this, numbers[0]); else ! return new UniformArrayFloat(this, getFloats(numbers, arraySize)); } if (storageClass == StorageClass.UNIFORM) { --- 241,247 ---- return new UniformScalarFloat(this, numbers[0]); else ! return new UniformArrayFloat(this, ! getFloats(numbers, ! arraySize)); } if (storageClass == StorageClass.UNIFORM) { *************** *** 243,258 **** return new UniformScalarFloat(this, numbers[0]); else ! return new VaryingScalarFloat(this, getFloats(numbers, arraySize)); } else { if (arraySize == count) ! return new UniformArrayFloat(this, getFloats(numbers, arraySize)); else ! return new VaryingArrayFloat(this, getFloats(numbers, arraySize)); } } else { if (count == 1) ! return new VaryingScalarFloat(this, getFloats(numbers, arraySize)); else ! return new VaryingArrayFloat(this, getFloats(numbers, arraySize)); } } else if (type == Type.INTEGER) { --- 250,274 ---- return new UniformScalarFloat(this, numbers[0]); else ! return new VaryingScalarFloat(this, ! getFloats(numbers, ! arraySize)); } else { if (arraySize == count) ! return new UniformArrayFloat(this, ! getFloats(numbers, ! arraySize)); else ! return new VaryingArrayFloat(this, ! getFloats(numbers, ! arraySize)); } } else { if (count == 1) ! return new VaryingScalarFloat(this, ! getFloats(numbers, ! arraySize)); else ! return new VaryingArrayFloat(this, ! getFloats(numbers, arraySize)); } } else if (type == Type.INTEGER) { *************** *** 261,272 **** return new UniformScalarInteger(this, (int) numbers[0]); else ! return new UniformArrayInteger(this, getInts(numbers, arraySize)); } else if (storageClass == StorageClass.UNIFORM) { if (arraySize == 1) return new UniformScalarInteger(this, (int) numbers[0]); else ! return new UniformArrayInteger(this, getInts(numbers, arraySize)); } else ! throw new IllegalArgumentException("Can't handle varying integer: " + this); } else if (type == Type.STRING) { if (storageClass == StorageClass.CONSTANT) { --- 277,291 ---- return new UniformScalarInteger(this, (int) numbers[0]); else ! return new UniformArrayInteger(this, ! getInts(numbers, arraySize)); } else if (storageClass == StorageClass.UNIFORM) { if (arraySize == 1) return new UniformScalarInteger(this, (int) numbers[0]); else ! return new UniformArrayInteger(this, ! getInts(numbers, arraySize)); } else ! throw new IllegalArgumentException( ! "Can't handle varying integer: " + this); } else if (type == Type.STRING) { if (storageClass == StorageClass.CONSTANT) { *************** *** 274,285 **** return new UniformScalarString(this, strings[0]); else ! return new UniformArrayString(this, getStrings(strings, arraySize)); } else if (storageClass == StorageClass.UNIFORM) { if (arraySize == 1) return new UniformScalarString(this, strings[0]); else ! return new UniformArrayString(this, getStrings(strings, arraySize)); } else ! throw new IllegalArgumentException("Can't handle varying string: " + this); } else if ( type == Type.COLOR --- 293,308 ---- return new UniformScalarString(this, strings[0]); else ! return new UniformArrayString(this, ! getStrings(strings, ! arraySize)); } else if (storageClass == StorageClass.UNIFORM) { if (arraySize == 1) return new UniformScalarString(this, strings[0]); else ! return new UniformArrayString(this, getStrings(strings, ! arraySize)); } else ! throw new IllegalArgumentException( ! "Can't handle varying string: " + this); } else if ( type == Type.COLOR *************** *** 289,295 **** if (storageClass == StorageClass.CONSTANT) { if (count == 1) ! return new UniformScalarTuple3f(this, numbers[0], numbers[1], numbers[2]); else ! return new UniformArrayTuple3f(this, getFloats(numbers, arraySize)); } else if (storageClass == StorageClass.UNIFORM) { if (count == 1) { --- 312,321 ---- if (storageClass == StorageClass.CONSTANT) { if (count == 1) ! return new UniformScalarTuple3f(this, numbers[0], ! numbers[1], numbers[2]); else ! return new UniformArrayTuple3f(this, ! getFloats(numbers, ! arraySize)); } else if (storageClass == StorageClass.UNIFORM) { if (count == 1) { *************** *** 301,316 **** numbers[2]); else ! return new VaryingScalarTuple3f(this, getFloats(numbers, arraySize)); } else { if (arraySize == count * 3) ! return new UniformArrayTuple3f(this, getFloats(numbers, arraySize)); else ! return new VaryingArrayTuple3f(this, getFloats(numbers, arraySize)); } } else { if (count == 1) ! return new VaryingScalarTuple3f(this, getFloats(numbers, arraySize)); else ! return new VaryingArrayTuple3f(this, getFloats(numbers, arraySize)); } } else if (type == Type.HPOINT) { --- 327,352 ---- numbers[2]); else ! return new VaryingScalarTuple3f(this, ! getFloats(numbers, ! arraySize)); } else { if (arraySize == count * 3) ! return new UniformArrayTuple3f(this, ! getFloats(numbers, ! arraySize)); else ! return new VaryingArrayTuple3f(this, ! getFloats(numbers, ! arraySize)); } } else { if (count == 1) ! return new VaryingScalarTuple3f(this, ! getFloats(numbers, ! arraySize)); else ! return new VaryingArrayTuple3f(this, ! getFloats(numbers, ! arraySize)); } } else if (type == Type.HPOINT) { *************** *** 324,328 **** numbers[3]); else ! return new UniformArrayHPoint(this, getFloats(numbers, arraySize)); } else if (storageClass == StorageClass.UNIFORM) { if (count == 1) { --- 360,366 ---- numbers[3]); else ! return new UniformArrayHPoint(this, ! getFloats(numbers, ! arraySize)); } else if (storageClass == StorageClass.UNIFORM) { if (count == 1) { *************** *** 335,350 **** numbers[3]); else ! return new VaryingScalarHPoint(this, getFloats(numbers, arraySize)); } else { if (arraySize == count * 4) ! return new UniformArrayHPoint(this, getFloats(numbers, arraySize)); else ! return new VaryingArrayHPoint(this, getFloats(numbers, arraySize)); } } else { if (count == 1) ! return new VaryingScalarHPoint(this, getFloats(numbers, arraySize)); else ! return new VaryingArrayHPoint(this, getFloats(numbers, arraySize)); } } --- 373,398 ---- numbers[3]); else ! return new VaryingScalarHPoint(this, ! getFloats(numbers, ! arraySize)); } else { if (arraySize == count * 4) ! return new UniformArrayHPoint(this, ! getFloats(numbers, ! arraySize)); else ! return new VaryingArrayHPoint(this, ! getFloats(numbers, ! arraySize)); } } else { if (count == 1) ! return new VaryingScalarHPoint(this, ! getFloats(numbers, ! arraySize)); else ! return new VaryingArrayHPoint(this, ! getFloats(numbers, ! arraySize)); } } Index: UniformArrayInteger.java =================================================================== RCS file: /cvsroot/jrman/drafts/src/org/jrman/parameters/UniformArrayInteger.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** UniformArrayInteger.java 11 Apr 2004 23:40:09 -0000 1.7 --- UniformArrayInteger.java 24 Dec 2006 05:25:56 -0000 1.8 *************** *** 1,19 **** /* ! UniformArrayInteger.java ! Copyright (C) 2003, 2004 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. */ --- 1,19 ---- /* ! UniformArrayInteger.java ! Copyright (C) 2003, 2004, 2006 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. */ *************** *** 35,44 **** } ! public Parameter linearInterpolate(float uMin, float uMax, float vMin, float vMax) { return this; } public void linearDice(Grid grid) { ! throw new UnsupportedOperationException("Parameter not diceable: " + declaration); } --- 35,55 ---- } ! public Parameter linearInterpolate(float min, float max) { ! return this; ! } ! ! public Parameter bilinearInterpolate(float uMin, float uMax, ! float vMin, float vMax) { return this; } public void linearDice(Grid grid) { ! throw new UnsupportedOperationException("Parameter not diceable: " + ! declaration); ! } ! ! public void bilinearDice(Grid grid) { ! throw new UnsupportedOperationException("Parameter not diceable: " + ! declaration); } Index: UniformArrayTuple3f.java =================================================================== RCS file: /cvsroot/jrman/drafts/src/org/jrman/parameters/UniformArrayTuple3f.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** UniformArrayTuple3f.java 8 Apr 2004 21:03:32 -0000 1.6 --- UniformArrayTuple3f.java 24 Dec 2006 05:25:56 -0000 1.7 *************** *** 1,19 **** /* ! UniformArrayTuple3f.java ! Copyright (C) 2003, 2004 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. */ --- 1,19 ---- /* ! UniformArrayTuple3f.java ! Copyright (C) 2003, 2004, 2006 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. */ *************** *** 39,48 **** } ! public Parameter linearInterpolate(float uMin, float uMax, float vMin, float vMax) { return this; } public void linearDice(Grid grid) { ! throw new UnsupportedOperationException("Parameter not diceable: " + declaration); } --- 39,59 ---- } ! public Parameter linearInterpolate(float min, float max) { ! return this; ! } ! ! public Parameter bilinearInterpolate(float uMin, float uMax, ! float vMin, float vMax) { return this; } public void linearDice(Grid grid) { ! throw new UnsupportedOperationException("Parameter not diceable: " + ! declaration); ! } ! ! public void bilinearDice(Grid grid) { ! throw new UnsupportedOperationException("Parameter not diceable: " + ! declaration); } Index: VaryingScalarFloat.java =================================================================== RCS file: /cvsroot/jrman/drafts/src/org/jrman/parameters/VaryingScalarFloat.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** VaryingScalarFloat.java 12 Apr 2004 04:37:25 -0000 1.8 --- VaryingScalarFloat.java 24 Dec 2006 05:25:56 -0000 1.9 *************** *** 1,19 **** /* ! VaryingScalarFloat.java ! Copyright (C) 2003, 2004 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. */ --- 1,19 ---- /* ! VaryingScalarFloat.java ! Copyright (C) 2003, 2004, 2006 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. */ *************** *** 37,50 **** } ! public Parameter linearInterpolate(float uMin, float uMax, float vMin, float vMax) { float[] newValues = new float[4]; newValues[0] = ! Calc.interpolate(values[0], values[1], values[2], values[3], uMin, vMin); newValues[1] = ! Calc.interpolate(values[0], values[1], values[2], values[3], uMax, vMin); newValues[2] = ! Calc.interpolate(values[0], values[1], values[2], values[3], uMin, vMax); newValues[3] = ! Calc.interpolate(values[0], values[1], values[2], values[3], uMax, vMax); return new VaryingScalarFloat(declaration, newValues); } --- 37,66 ---- } ! public int getCount() { ! return values.length; ! } ! ! public Parameter linearInterpolate(float min, float max) { ! float[] newValues = new float[2]; ! newValues[0] = Calc.interpolate(values[0], values[1], min); ! newValues[1] = Calc.interpolate(values[0], values[1], max); ! return new VaryingScalarFloat(declaration, newValues); ! } ! ! public Parameter bilinearInterpolate(float uMin, float uMax, ! float vMin, float vMax) { float[] newValues = new float[4]; newValues[0] = ! Calc.interpolate(values[0], values[1], values[2], values[3], ! uMin, vMin); newValues[1] = ! Calc.interpolate(values[0], values[1], values[2], values[3], ! uMax, vMin); newValues[2] = ! Calc.interpolate(values[0], values[1], values[2], values[3], ! uMin, vMax); newValues[3] = ! Calc.interpolate(values[0], values[1], values[2], values[3], ! uMax, vMax); return new VaryingScalarFloat(declaration, newValues); } *************** *** 52,55 **** --- 68,84 ---- public void linearDice(Grid grid) { FloatGrid g = (FloatGrid) grid; + int vSize = Grid.getVSize(); + float vStep = 1f / (vSize - 1); + float v = 0f; + for (int iv = 0; iv < vSize; iv++) { + float val = Calc.interpolate(values[0], values[1], v); + g.set(0, iv, val); + g.set(1, iv, val); + v += vStep; + } + } + + public void bilinearDice(Grid grid) { + FloatGrid g = (FloatGrid) grid; int uSize = Grid.getUSize(); int vSize = Grid.getVSize(); *************** *** 63,67 **** iu, iv, ! Calc.interpolate(values[0], values[1], values[2], values[3], u, v)); v += vStep; } --- 92,97 ---- iu, iv, ! Calc.interpolate(values[0], values[1], values[2], values[3], ! u, v)); v += vStep; } *************** *** 92,96 **** for (int u = 0; u < nu; u++) { newValues[v * nu + u] = ! Calc.interpolate(values[0], values[1], values[2], values[3], fu, fv); fu += uStep; } --- 122,127 ---- for (int u = 0; u < nu; u++) { newValues[v * nu + u] = ! Calc.interpolate(values[0], values[1], ! values[2], values[3], fu, fv); fu += uStep; } Index: VaryingScalarHPoint.java =================================================================== RCS file: /cvsroot/jrman/drafts/src/org/jrman/parameters/VaryingScalarHPoint.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** VaryingScalarHPoint.java 11 Apr 2004 23:40:09 -0000 1.8 --- VaryingScalarHPoint.java 24 Dec 2006 05:25:56 -0000 1.9 *************** *** 1,19 **** /* ! VaryingScalarHPoint.java ! Copyright (C) 2003, 2004 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. */ --- 1,19 ---- /* ! VaryingScalarHPoint.java ! Copyright (C) 2003, 2004, 2006 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. */ *************** *** 34,38 **** } ! public VaryingScalarHPoint(Declaration declaration, VaryingScalarTuple3f param) { super(declaration); values = new float[param.getCount() * 4]; --- 34,39 ---- } ! public VaryingScalarHPoint(Declaration declaration, ! VaryingScalarTuple3f param) { super(declaration); values = new float[param.getCount() * 4]; *************** *** 59,101 **** } ! public Parameter linearInterpolate(float uMin, float uMax, float vMin, float vMax) { float[] newValues = new float[16]; newValues[0] = ! Calc.interpolate(values[0], values[4], values[8], values[12], uMin, vMin); newValues[1] = ! Calc.interpolate(values[1], values[5], values[9], values[13], uMin, vMin); newValues[2] = ! Calc.interpolate(values[2], values[6], values[10], values[14], uMin, vMin); newValues[3] = ! Calc.interpolate(values[3], values[7], values[11], values[15], uMin, vMin); newValues[4] = ! Calc.interpolate(values[0], values[4], values[8], values[12], uMax, vMin); newValues[5] = ! Calc.interpolate(values[1], values[5], values[9], values[13], uMax, vMin); newValues[6] = ! Calc.interpolate(values[2], values[6], values[10], values[14], uMax, vMin); newValues[7] = ! Calc.interpolate(values[3], values[7], values[11], values[15], uMax, vMin); newValues[8] = ! Calc.interpolate(values[0], values[4], values[8], values[12], uMin, vMax); newValues[9] = ! Calc.interpolate(values[1], values[5], values[9], values[13], uMin, vMax); newValues[10] = ! Calc.interpolate(values[2], values[6], values[10], values[14], uMin, vMax); newValues[11] = ! Calc.interpolate(values[3], values[7], values[11], values[15], uMin, vMax); newValues[12] = ! Calc.interpolate(values[0], values[4], values[8], values[12], uMax, vMax); newValues[13] = ! Calc.interpolate(values[1], values[5], values[9], values[13], uMax, vMax); newValues[14] = ! Calc.interpolate(values[2], values[6], values[10], values[14], uMax, vMax); newValues[15] = ! Calc.interpolate(values[3], values[7], values[11], values[15], uMax, vMax); return new VaryingScalarHPoint(declaration, newValues); } public void linearDice(Grid grid) { ! throw new UnsupportedOperationException("Dice hpoint not implemented: " + declaration); } --- 60,138 ---- } ! public Parameter linearInterpolate(float min, float max) { ! float[] newValues = new float[8]; ! newValues[0] = Calc.interpolate(values[0], values[4], min); ! newValues[1] = Calc.interpolate(values[1], values[5], min); ! newValues[2] = Calc.interpolate(values[2], values[6], min); ! newValues[3] = Calc.interpolate(values[3], values[7], min); ! newValues[4] = Calc.interpolate(values[0], values[4], max); ! newValues[5] = Calc.interpolate(values[1], values[5], max); ! newValues[6] = Calc.interpolate(values[2], values[6], max); ! newValues[7] = Calc.interpolate(values[3], values[7], max); ! return new VaryingScalarHPoint(declaration, newValues); ! } ! ! public Parameter bilinearInterpolate(float uMin, float uMax, ! float vMin, float vMax) { float[] newValues = new float[16]; newValues[0] = ! Calc.interpolate(values[0], values[4], values[8], values[12], ! uMin, vMin); newValues[1] = ! Calc.interpolate(values[1], values[5], values[9], values[13], ! uMin, vMin); newValues[2] = ! Calc.interpolate(values[2], values[6], values[10], values[14], ! uMin, vMin); newValues[3] = ! Calc.interpolate(values[3], values[7], values[11], values[15], ! uMin, vMin); newValues[4] = ! Calc.interpolate(values[0], values[4], values[8], values[12], ! uMax, vMin); newValues[5] = ! Calc.interpolate(values[1], values[5], values[9], values[13], ! uMax, vMin); newValues[6] = ! Calc.interpolate(values[2], values[6], values[10], values[14], ! uMax, vMin); newValues[7] = ! Calc.interpolate(values[3], values[7], values[11], values[15], ! uMax, vMin); newValues[8] = ! Calc.interpolate(values[0], values[4], values[8], values[12], ! uMin, vMax); newValues[9] = ! Calc.interpolate(values[1], values[5], values[9], values[13], ! uMin, vMax); newValues[10] = ! Calc.interpolate(values[2], values[6], values[10], values[14], ! uMin, vMax); newValues[11] = ! Calc.interpolate(values[3], values[7], values[11], values[15], ! uMin, vMax); newValues[12] = ! Calc.interpolate(values[0], values[4], values[8], values[12], ! uMax, vMax); newValues[13] = ! Calc.interpolate(values[1], values[5], values[9], values[13], ! uMax, vMax); newValues[14] = ! Calc.interpolate(values[2], values[6], values[10], values[14], ! uMax, vMax); newValues[15] = ! Calc.interpolate(values[3], values[7], values[11], values[15], ! uMax, vMax); return new VaryingScalarHPoint(declaration, newValues); } public void linearDice(Grid grid) { ! throw new UnsupportedOperationException("Dice hpoint not implemented: " ! + declaration); ! } ! ! public void bilinearDice(Grid grid) { ! throw new UnsupportedOperationException("Dice hpoint not implemented: " ! + declaration); } Index: VaryingArrayFloat.java =================================================================== RCS file: /cvsroot/jrman/drafts/src/org/jrman/parameters/VaryingArrayFloat.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** VaryingArrayFloat.java 12 Apr 2004 05:05:56 -0000 1.10 --- VaryingArrayFloat.java 24 Dec 2006 05:25:56 -0000 1.11 *************** *** 1,19 **** /* ! VaryingArrayFloat.java ! Copyright (C) 2003, 2004 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. */ --- 1,19 ---- /* ! VaryingArrayFloat.java ! Copyright (C) 2003, 2004, 2006 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. */ *************** *** 40,44 **** } ! public Parameter linearInterpolate(float uMin, float uMax, float vMin, float vMax) { int n = declaration.getCount(); int n2 = n * 2; --- 40,55 ---- } ! public Parameter linearInterpolate(float min, float max) { ! int n = declaration.getCount(); ! float[] newValues = new float[2 * n]; ! for (int i = 0; i < n; i++) { ! newValues[i] = Calc.interpolate(values[i], values[n + i], min); ! newValues[n + i] = Calc.interpolate(values[i], values[n + i], max); ! } ! return new VaryingArrayFloat(declaration, newValues); ! } ! ! public Parameter bilinearInterpolate(float uMin, float uMax, ! float vMin, float vMax) { int n = declaration.getCount(); int n2 = n * 2; *************** *** 83,87 **** public void linearDice(Grid grid) { ! throw new UnsupportedOperationException("Dice array not implemented: " + declaration); } --- 94,104 ---- public void linearDice(Grid grid) { ! throw new UnsupportedOperationException("Dice array not implemented: " + ! declaration); ! } ! ! public void bilinearDice(Grid grid) { ! throw new UnsupportedOperationException("Dice array not implemented: " + ! declaration); } Index: UniformScalarFloat.java =================================================================== RCS file: /cvsroot/jrman/drafts/src/org/jrman/parameters/UniformScalarFloat.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** UniformScalarFloat.java 8 Apr 2004 21:03:32 -0000 1.5 --- UniformScalarFloat.java 24 Dec 2006 05:25:56 -0000 1.6 *************** *** 1,19 **** /* ! UniformScalarFloat.java ! Copyright (C) 2003, 2004 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. */ --- 1,19 ---- /* ! UniformScalarFloat.java ! Copyright (C) 2003, 2004, 2006 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. */ *************** *** 35,44 **** } ! public Parameter linearInterpolate(float uMin, float uMax, float vMin, float vMax) { return this; } public void linearDice(Grid grid) { ! throw new UnsupportedOperationException("Parameter not diceable: " + declaration); } --- 35,55 ---- } ! public Parameter linearInterpolate(float min, float max) { ! return this; ! } ! ! public Parameter bilinearInterpolate(float uMin, float uMax, ! float vMin, float vMax) { return this; } public void linearDice(Grid grid) { ! throw new UnsupportedOperationException("Parameter not diceable: " + ! declaration); ! } ! ! public void bilinearDice(Grid grid) { ! throw new UnsupportedOperationException("Parameter not diceable: " + ! declaration); } Index: UniformArrayString.java =================================================================== RCS file: /cvsroot/jrman/drafts/src/org/jrman/parameters/UniformArrayString.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** UniformArrayString.java 11 Apr 2004 23:40:09 -0000 1.7 --- UniformArrayString.java 24 Dec 2006 05:25:56 -0000 1.8 *************** *** 1,19 **** /* ! UniformArrayString.java ! Copyright (C) 2003, 2004 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. */ --- 1,19 ---- /* ! UniformArrayString.java ! Copyright (C) 2003, 2004, 2006 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. */ *************** *** 35,44 **** } ! public Parameter linearInterpolate(float uMin, float uMax, float vMin, float vMax) { return this; } public void linearDice(Grid grid) { ! throw new UnsupportedOperationException("Parameter not diceable: " + declaration); } --- 35,55 ---- } ! public Parameter linearInterpolate(float min, float max) { ! return this; ! } ! ! public Parameter bilinearInterpolate(float uMin, float uMax, ! float vMin, float vMax) { return this; } public void linearDice(Grid grid) { ! throw new UnsupportedOperationException("Parameter not diceable: " + ! declaration); ! } ! ! public void bilinearDice(Grid grid) { ! throw new UnsupportedOperationException("Parameter not diceable: " + ! declaration); } Index: ParameterList.java =================================================================== RCS file: /cvsroot/jrman/drafts/src/org/jrman/parameters/ParameterList.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** ParameterList.java 3 Jul 2005 00:23:04 -0000 1.9 --- ParameterList.java 24 Dec 2006 05:25:56 -0000 1.10 *************** *** 1,19 **** /* ! ParameterList.java ! Copyright (C) 2003 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. */ --- 1,19 ---- /* ! ParameterList.java ! Copyright (C) 2003, 2006 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. */ *************** *** 41,48 **** } ! public ParameterList linearInterpolate(float uMin, float uMax, float vMin, float vMax) { ParameterList pl = new ParameterList(count); for (int i = 0; i < getParameterCount(); i++) ! pl.addParameter(getParameter(i).linearInterpolate(uMin, uMax, vMin, vMax)); return pl; } --- 41,57 ---- } ! public ParameterList linearInterpolate(float min, float max) { ParameterList pl = new ParameterList(count); for (int i = 0; i < getParameterCount(); i++) ! pl.addParameter(getParameter(i).linearInterpolate(min, max)); ! return pl; ! } ! ! public ParameterList bilinearInterpolate(float uMin, float uMax, ! float vMin, float vMax) { ! ParameterList pl = new ParameterList(count); ! for (int i = 0; i < getParameterCount(); i++) ! pl.addParameter(getParameter(i).bilinearInterpolate(uMin, uMax, ! vMin, vMax)); return pl; } *************** *** 55,59 **** for (int i = 0; i < getParameterCount(); i++) { Parameter p = getParameter(i); ! Declaration.StorageClass sclass = p.getDeclaration().getStorageClass(); if (sclass.equals(Declaration.StorageClass.CONSTANT)) pl.addParameter(p); --- 64,69 ---- for (int i = 0; i < getParameterCount(); i++) { Parameter p = getParameter(i); ! Declaration.StorageClass sclass = ! p.getDeclaration().getStorageClass(); if (sclass.equals(Declaration.StorageClass.CONSTANT)) pl.addParameter(p); Index: UniformScalarHPoint.java =================================================================== RCS file: /cvsroot/jrman/drafts/src/org/jrman/parameters/UniformScalarHPoint.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** UniformScalarHPoint.java 8 Apr 2004 21:03:32 -0000 1.5 --- UniformScalarHPoint.java 24 Dec 2006 05:25:56 -0000 1.6 *************** *** 1,19 **** /* ! UniformScalarHPoint.java ! Copyright (C) 2003, 2004 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. */ --- 1,19 ---- /* ! UniformScalarHPoint.java ! Copyright (C) 2003, 2004, 2006 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. */ *************** *** 34,38 **** final private float w; ! public UniformScalarHPoint(Declaration declaration, float x, float y, float z, float w) { super(declaration); this.x = x; --- 34,39 ---- final private float w; ! public UniformScalarHPoint(Declaration declaration, ! float x, float y, float z, float w) { super(declaration); this.x = x; *************** *** 49,58 **** } ! public Parameter linearInterpolate(float uMin, float uMax, float vMin, float vMax) { return this; } public void linearDice(Grid grid) { ! throw new UnsupportedOperationException("Parameter not diceable: " + declaration); } --- 50,70 ---- } ! public Parameter linearInterpolate(float min, float max) { ! return this; ! } ! ! public Parameter bilinearInterpolate(float uMin, float uMax, ! float vMin, float vMax) { return this; } public void linearDice(Grid grid) { ! throw new UnsupportedOperationException("Parameter not diceable: " + ! declaration); ! } ! ! public void bilinearDice(Grid grid) { ! throw new UnsupportedOperationException("Parameter not diceable: " + ! declaration); } Index: UniformArrayHPoint.java =================================================================== RCS file: /cvsroot/jrman/drafts/src/org/jrman/parameters/UniformArrayHPoint.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** UniformArrayHPoint.java 8 Apr 2004 21:03:32 -0000 1.6 --- UniformArrayHPoint.java 24 Dec 2006 05:25:56 -0000 1.7 *************** *** 1,19 **** /* ! UniformArrayHPoint.java ! Copyright (C) 2003, 2004 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. */ --- 1,19 ---- /* ! UniformArrayHPoint.java ! Copyright (C) 2003, 2004, 2006 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. */ *************** *** 40,49 **** } ! public Parameter linearInterpolate(float uMin, float uMax, float vMin, float vMax) { return this; } public void linearDice(Grid grid) { ! throw new UnsupportedOperationException("Parameter not diceable: " + declaration); } --- 40,60 ---- } ! public Parameter linearInterpolate(float min, float max) { ! return this; ! } ! ! public Parameter bilinearInterpolate(float uMin, float uMax, ! float vMin, float vMax) { return this; } public void linearDice(Grid grid) { ! throw new UnsupportedOperationExcepti... [truncated message content] |
|
From: Gerardo H. <ma...@us...> - 2006-12-24 05:26:16
|
Update of /cvsroot/jrman/drafts/sampleData In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv30032/sampleData Added Files: curves.rib Log Message: Started working on curves. --- NEW FILE: curves.rib --- Display "curves.png" "framebuffer" "rgb" PixelFilter "gaussian" 2 2 Format 512 384 1 PixelSamples 8 8 Exposure 1 1.8 Projection "perspective" "fov" [35] LightSource "distantlight" 1 "intensity" [0.8] "from" [1 1 -1] "to" [0 0 0] LightSource "ambientlight" 2 "intensity" [0.2] Translate 0 0 20 Rotate -20 1 0 0 Rotate 30 0 1 0 WorldBegin Surface "matte" Color 0 0 1 Sphere 1 -1 1 360 Color 1 1 0 Curves "linear" [4 4] "periodic" "P" [-1 -1 -1 1 -1 -1 1 1 -1 -1 1 -1 -1 -1 1 1 -1 1 1 1 1 -1 1 1] "constantwidth" [.01] Curves "linear" [2 2 2 2] "nonperiodic" "P" [-1 -1 -1 -1 -1 1 1 -1 -1 1 -1 1 1 1 -1 1 1 1 -1 1 -1 -1 1 1] "constantwidth" [.01] Color 1 1 1 Curves "linear" [3] "nonperiodic" "P" [-3 -3 0 0 -3 0 3 -3 0] "N" [0 1 1 0 2 0 0 1 -1] "width" [.025 .05 .025] WorldEnd |
|
From: Gerardo H. <ma...@us...> - 2006-12-24 05:26:16
|
Update of /cvsroot/jrman/drafts/src/org/jrman/render In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv30032/src/org/jrman/render Modified Files: RendererHidden.java Sampler.java Log Message: Started working on curves. Index: Sampler.java =================================================================== RCS file: /cvsroot/jrman/drafts/src/org/jrman/render/Sampler.java,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** Sampler.java 23 Dec 2006 03:27:08 -0000 1.27 --- Sampler.java 24 Dec 2006 05:25:57 -0000 1.28 *************** *** 1,4 **** /* ! * Sampler.java Copyright (C) 2003 Gerardo Horvilleur Martinez * * This program is free software; you can redistribute it and/or modify it under --- 1,4 ---- /* ! * Sampler.java Copyright (C) 2003, 2006 Gerardo Horvilleur Martinez * * This program is free software; you can redistribute it and/or modify it under Index: RendererHidden.java =================================================================== RCS file: /cvsroot/jrman/drafts/src/org/jrman/render/RendererHidden.java,v retrieving revision 1.74 retrieving revision 1.75 diff -C2 -d -r1.74 -r1.75 *** RendererHidden.java 23 Dec 2006 03:27:07 -0000 1.74 --- RendererHidden.java 24 Dec 2006 05:25:57 -0000 1.75 *************** *** 1,4 **** /* ! * RendererHidden.java Copyright (C) 2003 Gerardo Horvilleur Martinez * * This program is free software; you can redistribute it and/or modify it --- 1,4 ---- /* ! * RendererHidden.java Copyright (C) 2003, 2006 Gerardo Horvilleur Martinez * * This program is free software; you can redistribute it and/or modify it |
|
From: Gerardo H. <ma...@us...> - 2006-12-23 03:27:15
|
Update of /cvsroot/jrman/drafts/src/org/jrman/render In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv30394/src/org/jrman/render Modified Files: RendererHidden.java Sampler.java Log Message: Removed useless stats counter (mpPixelCount). Index: Sampler.java =================================================================== RCS file: /cvsroot/jrman/drafts/src/org/jrman/render/Sampler.java,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** Sampler.java 18 Jul 2005 06:18:55 -0000 1.26 --- Sampler.java 23 Dec 2006 03:27:08 -0000 1.27 *************** *** 71,76 **** private int mpRootCount; - private int mpPixelCount; - public static class MaskElement { --- 71,74 ---- *************** *** 339,344 **** } - public int getMPPixelCount() { - return mpPixelCount; - } } \ No newline at end of file --- 337,339 ---- Index: RendererHidden.java =================================================================== RCS file: /cvsroot/jrman/drafts/src/org/jrman/render/RendererHidden.java,v retrieving revision 1.73 retrieving revision 1.74 diff -C2 -d -r1.73 -r1.74 *** RendererHidden.java 6 Dec 2006 17:17:10 -0000 1.73 --- RendererHidden.java 23 Dec 2006 03:27:07 -0000 1.74 *************** *** 545,549 **** System.out.println("Pixel count: " + sampler.getPixelCount()); System.out.println("MP Root count: " + sampler.getMPRootCount()); - System.out.println("MP Pixel count: " + sampler.getMPPixelCount()); System.out.println( "gridCount = " --- 545,548 ---- |
|
From: Gerardo H. <ma...@us...> - 2006-12-06 17:17:18
|
Update of /cvsroot/jrman/drafts/src/org/jrman/parser In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv4593/src/org/jrman/parser Modified Files: Global.java Parser.java Log Message: Implemented "truedisplacement" attribute. Now renders killeroo without cracks. Index: Parser.java =================================================================== RCS file: /cvsroot/jrman/drafts/src/org/jrman/parser/Parser.java,v retrieving revision 1.106 retrieving revision 1.107 diff -C2 -d -r1.106 -r1.107 *** Parser.java 7 Nov 2005 01:04:47 -0000 1.106 --- Parser.java 6 Dec 2006 17:17:10 -0000 1.107 *************** *** 726,729 **** --- 726,734 ---- if (param != null) currentAttributes.setTrimCurveSense(TrimCurveSense.getNamed(param.getValue())); + } else if (name.equals("render")) { + UniformScalarInteger param = + (UniformScalarInteger) parameters.getParameter("truedisplacement"); + if (param != null) + currentAttributes.setTrueDisplacement(param.getValue() == 1); } } Index: Global.java =================================================================== RCS file: /cvsroot/jrman/drafts/src/org/jrman/parser/Global.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Global.java 9 Apr 2004 22:33:22 -0000 1.11 --- Global.java 6 Dec 2006 17:17:10 -0000 1.12 *************** *** 78,81 **** --- 78,82 ---- declarations.put("__nondiffuse", new Declaration("__nondiffuse", "uniform float")); declarations.put("__nonspecular", new Declaration("__nonspecular", "uniform float")); + declarations.put("truedisplacement", new Declaration("truedisplacement", "integer")); } |
|
From: Gerardo H. <ma...@us...> - 2006-12-06 17:17:15
|
Update of /cvsroot/jrman/drafts/src/org/jrman/render In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv4593/src/org/jrman/render Modified Files: RendererHidden.java Log Message: Implemented "truedisplacement" attribute. Now renders killeroo without cracks. Index: RendererHidden.java =================================================================== RCS file: /cvsroot/jrman/drafts/src/org/jrman/render/RendererHidden.java,v retrieving revision 1.72 retrieving revision 1.73 diff -C2 -d -r1.72 -r1.73 *** RendererHidden.java 14 Nov 2005 02:51:32 -0000 1.72 --- RendererHidden.java 6 Dec 2006 17:17:10 -0000 1.73 *************** *** 34,37 **** --- 34,38 ---- import org.jrman.geom.Plane; import org.jrman.geom.Transform; + import org.jrman.grid.Point3fGrid; import org.jrman.maps.ShadowMap; import org.jrman.options.CameraProjection; *************** *** 115,118 **** --- 116,121 ---- private boolean rendering; + private Point3fGrid pointsTmp; + public void init(Frame frame, World world, Parser parser) { super.init(frame, world, parser); *************** *** 128,131 **** --- 131,135 ---- createBuckets(); samplesFilter = frame.getFilter().getSamplesFilter(); + pointsTmp = new Point3fGrid(); worldParseStart = System.currentTimeMillis(); } *************** *** 343,348 **** Attributes attr = p.getAttributes(); DisplacementShader ds = attr.getDisplacement(); ! if (ds != null) ds.shade(shaderVariables); if (cameraToRaster.isPerspective()) shaderVariables.I.set(shaderVariables.P); --- 347,359 ---- Attributes attr = p.getAttributes(); DisplacementShader ds = attr.getDisplacement(); ! if (ds != null) { ! Attributes attrShader = ds.getAttributes(); ! boolean ts = attrShader.getTrueDisplacement(); ! if (!ts) ! pointsTmp.set(shaderVariables.P); ds.shade(shaderVariables); + if (!ts) + shaderVariables.P.set(pointsTmp); + } if (cameraToRaster.isPerspective()) shaderVariables.I.set(shaderVariables.P); |
|
From: Gerardo H. <ma...@us...> - 2006-12-06 17:17:15
|
Update of /cvsroot/jrman/drafts/src/org/jrman/attributes In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv4593/src/org/jrman/attributes Modified Files: Attributes.java MutableAttributes.java Log Message: Implemented "truedisplacement" attribute. Now renders killeroo without cracks. Index: Attributes.java =================================================================== RCS file: /cvsroot/jrman/drafts/src/org/jrman/attributes/Attributes.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Attributes.java 18 Jul 2005 06:18:56 -0000 1.6 --- Attributes.java 6 Dec 2006 17:17:10 -0000 1.7 *************** *** 92,95 **** --- 92,97 ---- protected Space space; + + protected boolean trueDisplacement; protected Attributes() { *************** *** 125,128 **** --- 127,131 ---- vStep = other.getVStep(); space = other.getSpace(); + trueDisplacement = other.getTrueDisplacement(); } *************** *** 250,252 **** --- 253,259 ---- } + public boolean getTrueDisplacement() { + return trueDisplacement; + } + } Index: MutableAttributes.java =================================================================== RCS file: /cvsroot/jrman/drafts/src/org/jrman/attributes/MutableAttributes.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** MutableAttributes.java 7 Nov 2005 22:52:58 -0000 1.7 --- MutableAttributes.java 6 Dec 2006 17:17:10 -0000 1.8 *************** *** 65,68 **** --- 65,69 ---- vStep =3; space = Space.CAMERA; + trueDisplacement = true; } *************** *** 207,209 **** --- 208,215 ---- } + public void setTrueDisplacement(boolean v) { + trueDisplacement = v; + modified = true; + } + } |
|
From: Gerardo H. <ma...@us...> - 2006-12-06 17:17:13
|
Update of /cvsroot/jrman/drafts/sampleData In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv4593/sampleData Modified Files: headus.com-killeroo.rib Log Message: Implemented "truedisplacement" attribute. Now renders killeroo without cracks. Index: headus.com-killeroo.rib =================================================================== RCS file: /cvsroot/jrman/drafts/sampleData/headus.com-killeroo.rib,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** headus.com-killeroo.rib 11 Jan 2006 06:23:23 -0000 1.4 --- headus.com-killeroo.rib 6 Dec 2006 17:17:09 -0000 1.5 *************** *** 125,129 **** Displacement "disp_textured" "Km" 0.4 "mapname" ["killeroo-textures/pat006_0.4.txr"] "min_u" 0 "max_u" 2 "min_v" 0 "max_v" 8 Attribute "displacementbound" "coordinatesystem" ["world"] "sphere" [0.8] ! #Attribute "render" "truedisplacement" [1] NuPatch 5 4 [ 0 0 0 0 1 2 2 2 2 ] 0 2 11 4 [ 0 0 0 0 1 2 3 4 5 6 7 8 8 8 8 ] 0 8 "Pw" [ -8.678 124.338 17.178 1 -8.5592 124.435 16.8234 1 -8.3845 124.599 15.6189 1 --- 125,129 ---- Displacement "disp_textured" "Km" 0.4 "mapname" ["killeroo-textures/pat006_0.4.txr"] "min_u" 0 "max_u" 2 "min_v" 0 "max_v" 8 Attribute "displacementbound" "coordinatesystem" ["world"] "sphere" [0.8] ! Attribute "render" "truedisplacement" [1] NuPatch 5 4 [ 0 0 0 0 1 2 2 2 2 ] 0 2 11 4 [ 0 0 0 0 1 2 3 4 5 6 7 8 8 8 8 ] 0 8 "Pw" [ [...1842 lines suppressed...] ! Attribute "render" "truedisplacement" [0] Surface "matte" "Ka" 0 "Kd" 1 Displacement "disp_textured" "Km" 0.35 "mapname" ["killeroo-textures/pat4_0.35.txr"] "min_u" 0 "max_u" 4 "min_v" 0 "max_v" 7 Attribute "displacementbound" "coordinatesystem" ["world"] "sphere" [0.7] ! Attribute "render" "truedisplacement" [1] NuPatch 7 4 [ 0 0 0 0 1 2 3 4 4 4 4 ] 0 4 10 4 [ 0 0 0 0 1 2 3 4 5 6 7 7 7 7 ] 0 7 "Pw" [ -22.825 34.747 -131.767 1 -22.7511 35.7702 -131.952 1 -22.8998 37.0993 -132.041 1 *************** *** 6448,6452 **** -23.3059 40.5283 -138.202 1 -23.2739 42.3562 -137.793 1 -23.3192 43.0522 -136.88 1 -23.2892 42.9644 -136.374 1 ] ! #Attribute "render" "truedisplacement" [0] AttributeEnd WorldEnd --- 6448,6452 ---- -23.3059 40.5283 -138.202 1 -23.2739 42.3562 -137.793 1 -23.3192 43.0522 -136.88 1 -23.2892 42.9644 -136.374 1 ] ! Attribute "render" "truedisplacement" [0] AttributeEnd WorldEnd |
|
From: Gerardo H. <ma...@us...> - 2006-12-06 14:39:17
|
Update of /cvsroot/jrman/drafts/src/org/jrman/main In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv5421/src/org/jrman/main Modified Files: JRMan.java Log Message: Fixed minor version number in source code. Index: JRMan.java =================================================================== RCS file: /cvsroot/jrman/drafts/src/org/jrman/main/JRMan.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** JRMan.java 24 Oct 2004 21:14:37 -0000 1.10 --- JRMan.java 6 Dec 2006 14:39:09 -0000 1.11 *************** *** 36,40 **** public class JRMan { public static int majorNumber= 0; ! public static int minorNumber= 3; private static final String MESSAGE_APPNAME= "jrMan"; private static final String MESSAGE_APPDESCRIPTION= "Java REYES based renderer."; --- 36,40 ---- public class JRMan { public static int majorNumber= 0; ! public static int minorNumber= 4; private static final String MESSAGE_APPNAME= "jrMan"; private static final String MESSAGE_APPDESCRIPTION= "Java REYES based renderer."; |
|
From: Gerardo H. <ma...@us...> - 2006-12-06 06:33:07
|
Update of /cvsroot/jrman/drafts/jrMan/bin In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv6872/jrMan/bin Modified Files: jrmangui jrmangui.bat Log Message: Fixed jrmangui scripts Index: jrmangui =================================================================== RCS file: /cvsroot/jrman/drafts/jrMan/bin/jrmangui,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** jrmangui 16 Nov 2005 03:20:46 -0000 1.2 --- jrmangui 6 Dec 2006 06:33:01 -0000 1.3 *************** *** 1,4 **** ! export CLASSPATH=$JRMAN_HOME/jar/jrman.jar:$JRMAN_HOME/jar/vecmath.jar:$JRMAN_HOME/jar/commons-cli-1.0.jar:$JRMAN_HOME/jar/form-1.0.3.jar:$JRMAN_HOME/jar/looks-1.2.0.jar export MEMORY=256m ! java -Xms$MEMORY -Xmx$MEMORY org.jrman.main.JRManGUI \ No newline at end of file --- 1,4 ---- ! export CLASSPATH=$JRMAN_HOME/jar/jrman.jar:$JRMAN_HOME/jar/vecmath.jar:$JRMAN_HOME/jar/commons-cli-1.0.jar:$JRMAN_HOME/jar/forms-1.0.3.jar:$JRMAN_HOME/jar/looks-1.2.0.jar export MEMORY=256m ! java -Xms$MEMORY -Xmx$MEMORY org.jrman.main.JrManGUI \ No newline at end of file Index: jrmangui.bat =================================================================== RCS file: /cvsroot/jrman/drafts/jrMan/bin/jrmangui.bat,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** jrmangui.bat 16 Nov 2005 03:20:46 -0000 1.2 --- jrmangui.bat 6 Dec 2006 06:33:01 -0000 1.3 *************** *** 3,5 **** set CLASSPATH=%JRMAN_HOME%\jar\jrman.jar;%JRMAN_HOME%\jar\vecmath.jar;%JRMAN_HOME%\jar\commons-cli-1.0.jar;%JRMAN_HOME%\jar\forms-1.0.3.jar;%JRMAN_HOME%\jar\looks-1.2.0.jar set MEMORY=256m ! java -Xms%MEMORY% -Xmx%MEMORY% org.jrman.main.JRManGUI \ No newline at end of file --- 3,5 ---- set CLASSPATH=%JRMAN_HOME%\jar\jrman.jar;%JRMAN_HOME%\jar\vecmath.jar;%JRMAN_HOME%\jar\commons-cli-1.0.jar;%JRMAN_HOME%\jar\forms-1.0.3.jar;%JRMAN_HOME%\jar\looks-1.2.0.jar set MEMORY=256m ! java -Xms%MEMORY% -Xmx%MEMORY% org.jrman.main.JrManGUI \ No newline at end of file |
|
From: Gerardo H. <ma...@us...> - 2006-12-06 06:33:07
|
Update of /cvsroot/jrman/drafts In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv6872 Modified Files: build.xml Log Message: Fixed jrmangui scripts Index: build.xml =================================================================== RCS file: /cvsroot/jrman/drafts/build.xml,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** build.xml 16 Nov 2005 03:20:45 -0000 1.17 --- build.xml 6 Dec 2006 06:33:01 -0000 1.18 *************** *** 76,79 **** --- 76,80 ---- <chmod perm="+x" file="${dist}/bin/jrman"/> <chmod perm="+x" file="${dist}/bin/mktxr"/> + <chmod perm="+x" file="${dist}/bin/jrmangui"/> <copy todir="${dist}/src" > *************** *** 145,148 **** --- 146,150 ---- <include name="${dist}/bin/jrman"/> <include name="${dist}/bin/mktxr"/> + <include name="${dist}/bin/jrmangui"/> </tarfileset> <tarfileset dir="."> *************** *** 150,153 **** --- 152,156 ---- <exclude name="${dist}/bin/jrman"/> <exclude name="${dist}/bin/mktxr"/> + <exclude name="${dist}/bin/jrmangui"/> </tarfileset> </tar> |
|
From: Gerardo H. <ma...@us...> - 2006-01-11 06:23:37
|
Update of /cvsroot/jrman/drafts/src/org/jrman/primitive In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11875/src/org/jrman/primitive Modified Files: BicubicPatch.java Log Message: Undid changes in bicubic patch normals. Index: BicubicPatch.java =================================================================== RCS file: /cvsroot/jrman/drafts/src/org/jrman/primitive/BicubicPatch.java,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** BicubicPatch.java 21 Dec 2005 06:03:26 -0000 1.18 --- BicubicPatch.java 11 Jan 2006 06:23:23 -0000 1.19 *************** *** 423,467 **** protected void dice_Ng(ShaderVariables sv) { ! extractPoints(); ! Vector3fGrid dPdu = sv.dPdu; ! Vector3fGrid dPdv = sv.dPdv; ! int nu = Grid.getUSize(); ! int nv = Grid.getVSize(); ! float uStep = 1f / (nu - 1); ! float vStep = 1f / (nv - 1); ! float fv = 0f; ! int offset = 0; ! for (int v = 0; v < nv; v++) { ! float fu = 0f; ! for (int u = 0; u < nu; u++) { ! Calc.bezierInterpolate( ! P00, ! P10, ! P20, ! P30, ! P01, ! P11, ! P21, ! P31, ! P02, ! P12, ! P22, ! P32, ! P03, ! P13, ! P23, ! P33, ! fu, ! fv, ! PS00); ! P3F.x = PS00.x / PS00.w; ! P3F.y = PS00.y / PS00.w; ! P3F.z = PS00.z / PS00.w; ! // pdata[offset + u].set(P3F); ! fu += uStep; ! } ! fv += vStep; ! offset += nu; ! } } --- 423,427 ---- protected void dice_Ng(ShaderVariables sv) { ! sv.Ng.cross(sv.dPdu, sv.dPdv); } |
|
From: Gerardo H. <ma...@us...> - 2006-01-11 06:23:37
|
Update of /cvsroot/jrman/drafts/src/org/jrman/shaders In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11875/src/org/jrman/shaders Modified Files: DisplacementShader.java Log Message: Undid changes in bicubic patch normals. Index: DisplacementShader.java =================================================================== RCS file: /cvsroot/jrman/drafts/src/org/jrman/shaders/DisplacementShader.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** DisplacementShader.java 25 Nov 2003 16:34:08 -0000 1.6 --- DisplacementShader.java 11 Jan 2006 06:23:23 -0000 1.7 *************** *** 56,60 **** } ! protected void calculatenormal(ShaderVariables sv, Point3fGrid P, Vector3fGrid normal) { _dPdu.Du(P, sv.du); _dPdv.Dv(P, sv.dv); --- 56,61 ---- } ! protected void calculatenormal(ShaderVariables sv, Point3fGrid P, ! Vector3fGrid normal) { _dPdu.Du(P, sv.du); _dPdv.Dv(P, sv.dv); |
|
From: Gerardo H. <ma...@us...> - 2006-01-11 06:23:37
|
Update of /cvsroot/jrman/drafts/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11875/src Modified Files: DisplacementDisp_textured.java Log Message: Undid changes in bicubic patch normals. Index: DisplacementDisp_textured.java =================================================================== RCS file: /cvsroot/jrman/drafts/src/DisplacementDisp_textured.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DisplacementDisp_textured.java 14 Dec 2005 01:08:49 -0000 1.1 --- DisplacementDisp_textured.java 11 Jan 2006 06:23:23 -0000 1.2 *************** *** 31,34 **** --- 31,38 ---- private static FloatGrid fg1 = new FloatGrid(); + private static FloatGrid fgu = new FloatGrid(); + + private static FloatGrid fgv = new FloatGrid(); + private static Vector3fGrid Nn = new Vector3fGrid(); *************** *** 44,47 **** --- 48,63 ---- new UniformScalarFloat(new Declaration("blur", "uniform float"), 0f)); + defaultParameters.addParameter( + new UniformScalarFloat(new Declaration("min_u", "uniform float"), + 0f)); + defaultParameters.addParameter( + new UniformScalarFloat(new Declaration("max_u", "uniform float"), + 1f)); + defaultParameters.addParameter( + new UniformScalarFloat(new Declaration("min_v", "uniform float"), + 0f)); + defaultParameters.addParameter( + new UniformScalarFloat(new Declaration("max_v", "uniform float"), + 1f)); } *************** *** 70,80 **** float blur = paramBlur.getValue(); ! sv.u.sub(sv.u, min_u); ! sv.u.div(sv.u, (max_u - min_u)); ! sv.v.sub(sv.v, min_v); ! sv.v.div(sv.v, (max_v - min_v)); if (!texturename.equals("")) ! fg1.texture(texturename, sv.u, sv.v, blur, 0); else fg1.set(0f); --- 86,96 ---- float blur = paramBlur.getValue(); ! fgu.sub(sv.u, min_u); ! fgu.div(fgu, (max_u - min_u)); ! fgv.sub(sv.v, min_v); ! fgv.div(fgv, (max_v - min_v)); if (!texturename.equals("")) ! fg1.texture(texturename, fgu, fgv, blur, 0); else fg1.set(0f); |
|
From: Gerardo H. <ma...@us...> - 2006-01-11 06:23:37
|
Update of /cvsroot/jrman/drafts/src/org/jrman/grid In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11875/src/org/jrman/grid Modified Files: FloatGrid.java Point3fGrid.java Tuple3fGrid.java Vector3fGrid.java Log Message: Undid changes in bicubic patch normals. Index: Vector3fGrid.java =================================================================== RCS file: /cvsroot/jrman/drafts/src/org/jrman/grid/Vector3fGrid.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Vector3fGrid.java 8 Feb 2004 08:54:55 -0000 1.8 --- Vector3fGrid.java 11 Jan 2006 06:23:23 -0000 1.9 *************** *** 66,70 **** } ! public void vtransform(Vector3fGrid v, Transform transform, BooleanGrid cond) { Vector3f[] tdata = (Vector3f[]) data; Vector3f[] vdata = (Vector3f[]) v.data; --- 66,71 ---- } ! public void vtransform(Vector3fGrid v, Transform transform, ! BooleanGrid cond) { Vector3f[] tdata = (Vector3f[]) data; Vector3f[] vdata = (Vector3f[]) v.data; *************** *** 85,89 **** } ! public void ntransform(Vector3fGrid n, Transform transform, BooleanGrid cond) { Vector3f[] tdata = (Vector3f[]) data; Vector3f[] ndata = (Vector3f[]) n.data; --- 86,91 ---- } ! public void ntransform(Vector3fGrid n, Transform transform, ! BooleanGrid cond) { Vector3f[] tdata = (Vector3f[]) data; Vector3f[] ndata = (Vector3f[]) n.data; *************** *** 149,153 **** } for (int i = 0; i < size; i += uSize) { ! if (vdata[i + 1].x == 0 && vdata[i + 1].y == 0 && vdata[i + 1].z == 0) vdata[i + 1].set(vdata[i + 2]); if (vdata[i].x == 0 && vdata[i].y == 0 && vdata[i].z == 0) --- 151,156 ---- } for (int i = 0; i < size; i += uSize) { ! if (vdata[i + 1].x == 0 && vdata[i + 1].y == 0 && ! vdata[i + 1].z == 0) vdata[i + 1].set(vdata[i + 2]); if (vdata[i].x == 0 && vdata[i].y == 0 && vdata[i].z == 0) *************** *** 155,159 **** } for (int i = uSize - 1; i < size; i += uSize) { ! if (vdata[i - 1].x == 0 && vdata[i - 1].y == 0 && vdata[i - 1].z == 0) vdata[i - 1].set(vdata[i - 2]); if (vdata[i].x == 0 && vdata[i].y == 0 && vdata[i].z == 0) --- 158,163 ---- } for (int i = uSize - 1; i < size; i += uSize) { ! if (vdata[i - 1].x == 0 && vdata[i - 1].y == 0 && ! vdata[i - 1].z == 0) vdata[i - 1].set(vdata[i - 2]); if (vdata[i].x == 0 && vdata[i].y == 0 && vdata[i].z == 0) Index: FloatGrid.java =================================================================== RCS file: /cvsroot/jrman/drafts/src/org/jrman/grid/FloatGrid.java,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** FloatGrid.java 14 Dec 2005 01:08:49 -0000 1.26 --- FloatGrid.java 11 Jan 2006 06:23:23 -0000 1.27 *************** *** 718,725 **** } ! public void mix(FloatGrid f1, FloatGrid f2, FloatGrid alpha, BooleanGrid cond) { for (int i = 0; i < size; i++) if (cond.data[i]) ! data[i] = Calc.interpolate(f1.data[i], f2.data[i], alpha.data[i]); } --- 718,727 ---- } ! public void mix(FloatGrid f1, FloatGrid f2, FloatGrid alpha, ! BooleanGrid cond) { for (int i = 0; i < size; i++) if (cond.data[i]) ! data[i] = ! Calc.interpolate(f1.data[i], f2.data[i], alpha.data[i]); } *************** *** 827,831 **** } ! public void smoothstep(float f1, FloatGrid f2, float alpha, BooleanGrid cond) { for (int i = 0; i < size; i++) if (cond.data[i]) --- 829,834 ---- } ! public void smoothstep(float f1, FloatGrid f2, float alpha, ! BooleanGrid cond) { for (int i = 0; i < size; i++) if (cond.data[i]) *************** *** 874,878 **** } ! public void smoothstep(FloatGrid f1, FloatGrid f2, float alpha, BooleanGrid cond) { for (int i = 0; i < size; i++) if (cond.data[i]) --- 877,882 ---- } ! public void smoothstep(FloatGrid f1, FloatGrid f2, float alpha, ! BooleanGrid cond) { for (int i = 0; i < size; i++) if (cond.data[i]) *************** *** 889,893 **** for (int i = 0; i < size; i++) if (cond.data[i]) ! data[i] = Calc.smoothstep(f1.data[i], f2.data[i], alpha.data[i]); } --- 893,898 ---- for (int i = 0; i < size; i++) if (cond.data[i]) ! data[i] = ! Calc.smoothstep(f1.data[i], f2.data[i], alpha.data[i]); } Index: Point3fGrid.java =================================================================== RCS file: /cvsroot/jrman/drafts/src/org/jrman/grid/Point3fGrid.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Point3fGrid.java 25 Oct 2003 05:46:47 -0000 1.5 --- Point3fGrid.java 11 Jan 2006 06:23:23 -0000 1.6 *************** *** 47,51 **** } ! public void transform(Point3fGrid p, Transform transform, BooleanGrid cond) { Point3f[] tdata = (Point3f[]) data; Point3f[] pdata = (Point3f[]) p.data; --- 47,52 ---- } ! public void transform(Point3fGrid p, Transform transform, ! BooleanGrid cond) { Point3f[] tdata = (Point3f[]) data; Point3f[] pdata = (Point3f[]) p.data; Index: Tuple3fGrid.java =================================================================== RCS file: /cvsroot/jrman/drafts/src/org/jrman/grid/Tuple3fGrid.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Tuple3fGrid.java 8 Feb 2004 08:54:55 -0000 1.10 --- Tuple3fGrid.java 11 Jan 2006 06:23:23 -0000 1.11 *************** *** 54,60 **** public void set(float in) { for (int i= 0; i < size; i++) { ! data[i].x= in; ! data[i].y= in; ! data[i].z= in; } } --- 54,60 ---- public void set(float in) { for (int i= 0; i < size; i++) { [...1334 lines suppressed...] } public void setzcomp(FloatGrid z) { for (int i= 0; i < size; i++) ! data[i].z = z.data[i]; } *************** *** 889,893 **** for (int i= 0; i < size; i++) if (cond.data[i]) ! data[i].z= z.data[i]; } --- 958,962 ---- for (int i= 0; i < size; i++) if (cond.data[i]) ! data[i].z = z.data[i]; } |
|
From: Gerardo H. <ma...@us...> - 2006-01-11 06:23:37
|
Update of /cvsroot/jrman/drafts/sampleData In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11875/sampleData Modified Files: headus.com-killeroo.rib Log Message: Undid changes in bicubic patch normals. Index: headus.com-killeroo.rib =================================================================== RCS file: /cvsroot/jrman/drafts/sampleData/headus.com-killeroo.rib,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** headus.com-killeroo.rib 13 Dec 2005 22:43:57 -0000 1.3 --- headus.com-killeroo.rib 11 Jan 2006 06:23:23 -0000 1.4 *************** *** 96,100 **** FrameBegin 1 Display "killeroo" "framebuffer" "rgba" ! PixelSamples 16 16 Exposure 1 1.8 #Imager "background" "background" [ 1.0 1.0 1.0 ] --- 96,100 ---- FrameBegin 1 Display "killeroo" "framebuffer" "rgba" ! PixelSamples 8 8 Exposure 1 1.8 #Imager "background" "background" [ 1.0 1.0 1.0 ] |
|
From: Gerardo H. <ma...@us...> - 2005-12-21 06:03:34
|
Update of /cvsroot/jrman/drafts/src/org/jrman/primitive In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12837/src/org/jrman/primitive Modified Files: BicubicPatch.java Log Message: Temporary commit (fixing Ng in bicubicpatch) Index: BicubicPatch.java =================================================================== RCS file: /cvsroot/jrman/drafts/src/org/jrman/primitive/BicubicPatch.java,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** BicubicPatch.java 6 Jul 2005 22:53:23 -0000 1.17 --- BicubicPatch.java 21 Dec 2005 06:03:26 -0000 1.18 *************** *** 29,32 **** --- 29,33 ---- import org.jrman.geom.ConvexHull3f; import org.jrman.grid.Grid; + import org.jrman.grid.Vector3fGrid; import org.jrman.parameters.Declaration; import org.jrman.parameters.ParameterList; *************** *** 422,426 **** protected void dice_Ng(ShaderVariables sv) { ! sv.Ng.cross(sv.dPdu, sv.dPdv); } --- 423,467 ---- protected void dice_Ng(ShaderVariables sv) { ! extractPoints(); ! Vector3fGrid dPdu = sv.dPdu; ! Vector3fGrid dPdv = sv.dPdv; ! int nu = Grid.getUSize(); ! int nv = Grid.getVSize(); ! float uStep = 1f / (nu - 1); ! float vStep = 1f / (nv - 1); ! float fv = 0f; ! int offset = 0; ! for (int v = 0; v < nv; v++) { ! float fu = 0f; ! for (int u = 0; u < nu; u++) { ! Calc.bezierInterpolate( ! P00, ! P10, ! P20, ! P30, ! P01, ! P11, ! P21, ! P31, ! P02, ! P12, ! P22, ! P32, ! P03, ! P13, ! P23, ! P33, ! fu, ! fv, ! PS00); ! P3F.x = PS00.x / PS00.w; ! P3F.y = PS00.y / PS00.w; ! P3F.z = PS00.z / PS00.w; ! // pdata[offset + u].set(P3F); ! fu += uStep; ! } ! fv += vStep; ! offset += nu; ! } } |
|
From: Elmer G. <ega...@us...> - 2005-12-14 01:08:57
|
Update of /cvsroot/jrman/drafts/src/org/jrman/grid In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20743/src/org/jrman/grid Modified Files: FloatGrid.java Log Message: Added missing file Index: FloatGrid.java =================================================================== RCS file: /cvsroot/jrman/drafts/src/org/jrman/grid/FloatGrid.java,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** FloatGrid.java 13 Apr 2004 20:37:02 -0000 1.25 --- FloatGrid.java 14 Dec 2005 01:08:49 -0000 1.26 *************** *** 40,44 **** public float[] data; ! private static float getFloat(MipMap texture, float s, float t, float area, int band) { texture.getData(s, t, area, mmData); return mmData[band]; --- 40,45 ---- public float[] data; ! private static float getFloat(MipMap texture, float s, float t, ! float area, int band) { texture.getData(s, t, area, mmData); return mmData[band]; *************** *** 814,818 **** } ! public void smoothstep(float f1, float f2, FloatGrid alpha, BooleanGrid cond) { for (int i = 0; i < size; i++) if (cond.data[i]) --- 815,820 ---- } ! public void smoothstep(float f1, float f2, FloatGrid alpha, ! BooleanGrid cond) { for (int i = 0; i < size; i++) if (cond.data[i]) *************** *** 836,840 **** } ! public void smoothstep(float f1, FloatGrid f2, FloatGrid alpha, BooleanGrid cond) { for (int i = 0; i < size; i++) if (cond.data[i]) --- 838,843 ---- } ! public void smoothstep(float f1, FloatGrid f2, FloatGrid alpha, ! BooleanGrid cond) { for (int i = 0; i < size; i++) if (cond.data[i]) *************** *** 847,851 **** } ! public void smoothstep(FloatGrid f1, float f2, float alpha, BooleanGrid cond) { for (int i = 0; i < size; i++) if (cond.data[i]) --- 850,855 ---- } ! public void smoothstep(FloatGrid f1, float f2, float alpha, ! BooleanGrid cond) { for (int i = 0; i < size; i++) if (cond.data[i]) *************** *** 858,862 **** } ! public void smoothstep(FloatGrid f1, float f2, FloatGrid alpha, BooleanGrid cond) { for (int i = 0; i < size; i++) if (cond.data[i]) --- 862,867 ---- } ! public void smoothstep(FloatGrid f1, float f2, FloatGrid alpha, ! BooleanGrid cond) { for (int i = 0; i < size; i++) if (cond.data[i]) *************** *** 880,884 **** } ! public void smoothstep(FloatGrid f1, FloatGrid f2, FloatGrid alpha, BooleanGrid cond) { for (int i = 0; i < size; i++) if (cond.data[i]) --- 885,890 ---- } ! public void smoothstep(FloatGrid f1, FloatGrid f2, FloatGrid alpha, ! BooleanGrid cond) { for (int i = 0; i < size; i++) if (cond.data[i]) *************** *** 913,919 **** for (int i = 0; i < size; i += uSize) { for (int j = 0; j < uSize - 1; j++) ! data[i + j] = (f1.data[i + j + 1] - f1.data[i + j]) / du.data[i + j]; data[i + uSize - 1] = ! (f1.data[i + uSize - 1] - f1.data[i + uSize - 2]) / du.data[i + uSize - 1]; } } --- 919,927 ---- for (int i = 0; i < size; i += uSize) { for (int j = 0; j < uSize - 1; j++) ! data[i + j] = (f1.data[i + j + 1] - f1.data[i + j]) / ! du.data[i + j]; data[i + uSize - 1] = ! (f1.data[i + uSize - 1] - f1.data[i + uSize - 2]) / ! du.data[i + uSize - 1]; } } *************** *** 923,930 **** for (int j = 0; j < uSize - 1; j++) if (cond.data[i + j]) ! data[i + j] = (f1.data[i + j + 1] - f1.data[i + j]) / du.data[i + j]; if (cond.data[i + uSize - 1]) data[i + uSize - 1] = ! (f1.data[i + uSize - 1] - f1.data[i + uSize - 2]) / du.data[i + uSize - 1]; } } --- 931,940 ---- for (int j = 0; j < uSize - 1; j++) if (cond.data[i + j]) ! data[i + j] = (f1.data[i + j + 1] - f1.data[i + j]) / ! du.data[i + j]; if (cond.data[i + uSize - 1]) data[i + uSize - 1] = ! (f1.data[i + uSize - 1] - f1.data[i + uSize - 2]) / ! du.data[i + uSize - 1]; } } *************** *** 945,949 **** for (int i = 0; i < size - uSize; i += uSize) for (int j = 0; j < uSize; j++) ! data[i + j] = (f1.data[i + j + uSize] - f1.data[i + j]) / dv.data[i + j]; for (int i = size - uSize; i < size; i++) data[i] = (f1.data[i] - f1.data[i - uSize]) / dv.data[i]; --- 955,960 ---- for (int i = 0; i < size - uSize; i += uSize) for (int j = 0; j < uSize; j++) ! data[i + j] = (f1.data[i + j + uSize] - f1.data[i + j]) / ! dv.data[i + j]; for (int i = size - uSize; i < size; i++) data[i] = (f1.data[i] - f1.data[i - uSize]) / dv.data[i]; *************** *** 954,958 **** for (int j = 0; j < uSize; j++) if (cond.data[i + j]) ! data[i + j] = (f1.data[i + j + uSize] - f1.data[i + j]) / dv.data[i + j]; for (int i = size - uSize; i < size; i++) if (cond.data[i]) --- 965,970 ---- for (int j = 0; j < uSize; j++) if (cond.data[i + j]) ! data[i + j] = (f1.data[i + j + uSize] - f1.data[i + j]) / ! dv.data[i + j]; for (int i = size - uSize; i < size; i++) if (cond.data[i]) *************** *** 991,1005 **** public void noise(FloatGrid x, FloatGrid y, FloatGrid z) { for (int i = 0; i < size; i++) ! data[i] = 0.5f * PerlinNoise.noise3d(x.data[i], y.data[i], z.data[i]) + 0.5f; } public void noise(FloatGrid x, FloatGrid y, FloatGrid z, float w) { for (int i = 0; i < size; i++) ! data[i] = 0.5f * PerlinNoise.noise4d(x.data[i], y.data[i], z.data[i], w) + 0.5f; } public void noise(Tuple3fGrid t) { for (int i = 0; i < size; i++) ! data[i] = 0.5f * PerlinNoise.noise3d(t.data[i].x, t.data[i].y, t.data[i].z) + 0.5f; } --- 1003,1020 ---- public void noise(FloatGrid x, FloatGrid y, FloatGrid z) { for (int i = 0; i < size; i++) ! data[i] = 0.5f * PerlinNoise.noise3d(x.data[i], y.data[i], ! z.data[i]) + 0.5f; } public void noise(FloatGrid x, FloatGrid y, FloatGrid z, float w) { for (int i = 0; i < size; i++) ! data[i] = 0.5f * PerlinNoise.noise4d(x.data[i], y.data[i], ! z.data[i], w) + 0.5f; } public void noise(Tuple3fGrid t) { for (int i = 0; i < size; i++) ! data[i] = 0.5f * PerlinNoise.noise3d(t.data[i].x, t.data[i].y, ! t.data[i].z) + 0.5f; } *************** *** 1007,1011 **** for (int i = 0; i < size; i++) data[i] = ! 0.5f * PerlinNoise.noise4d(t.data[i].x, t.data[i].y, t.data[i].z, w) + 0.5f; } --- 1022,1027 ---- for (int i = 0; i < size; i++) data[i] = ! 0.5f * PerlinNoise.noise4d(t.data[i].x, t.data[i].y, ! t.data[i].z, w) + 0.5f; } *************** *** 1037,1046 **** public void snoise(Tuple3fGrid t) { for (int i = 0; i < size; i++) ! data[i] = PerlinNoise.noise3d(t.data[i].x, t.data[i].y, t.data[i].z); } public void snoise(Tuple3fGrid t, float w) { for (int i = 0; i < size; i++) ! data[i] = PerlinNoise.noise4d(t.data[i].x, t.data[i].y, t.data[i].z, w); } --- 1053,1064 ---- public void snoise(Tuple3fGrid t) { for (int i = 0; i < size; i++) ! data[i] = PerlinNoise.noise3d(t.data[i].x, t.data[i].y, ! t.data[i].z); } public void snoise(Tuple3fGrid t, float w) { for (int i = 0; i < size; i++) ! data[i] = PerlinNoise.noise4d(t.data[i].x, t.data[i].y, ! t.data[i].z, w); } *************** *** 1054,1058 **** float nx = x.data[i] > 0 ? x.data[i] % px : (-x.data[i]) % px; float pmx = px - nx; ! data[i] = (PerlinNoise.noise1d(nx) * pmx + PerlinNoise.noise1d(-pmx) * nx); data[i] /= px; data[i] = .5f + data[i] * .5f; --- 1072,1077 ---- float nx = x.data[i] > 0 ? x.data[i] % px : (-x.data[i]) % px; float pmx = px - nx; ! data[i] = (PerlinNoise.noise1d(nx) * pmx + ! PerlinNoise.noise1d(-pmx) * nx); data[i] /= px; data[i] = .5f + data[i] * .5f; *************** *** 1067,1074 **** float pmx = px - nx; float pmy = py - ny; ! data[i] = ! (PerlinNoise.noise2d(nx, ny) * pmx + PerlinNoise.noise2d(-pmx, ny) * nx) * pmy; ! data[i] ! += (PerlinNoise.noise2d(nx, -pmy) * pmx + PerlinNoise.noise2d(-pmx, -pmy) * nx) * ny; data[i] /= px * py; --- 1086,1093 ---- float pmx = px - nx; float pmy = py - ny; ! data[i] = (PerlinNoise.noise2d(nx, ny) * pmx + ! PerlinNoise.noise2d(-pmx, ny) * nx) * pmy; ! data[i] += (PerlinNoise.noise2d(nx, -pmy) * pmx + ! PerlinNoise.noise2d(-pmx, -pmy) * nx) * ny; data[i] /= px * py; *************** *** 1077,1081 **** } ! public void pnoise(FloatGrid x, FloatGrid y, FloatGrid z, float px, float py, float pz) { assert px > 0f && py > 0f && pz > 0f; for (int i = 0; i < size; i++) { --- 1096,1101 ---- } ! public void pnoise(FloatGrid x, FloatGrid y, FloatGrid z, float px, ! float py, float pz) { assert px > 0f && py > 0f && pz > 0f; for (int i = 0; i < size; i++) { *************** *** 1196,1200 **** } ! public void pnoise(Tuple3fGrid t, float w, float px, float py, float pz, float pw) { assert px > 0f && py > 0f && pz > 0f && pw > 0f; float nw = w > 0 ? w % pw : (-w) % pw; --- 1216,1221 ---- } ! public void pnoise(Tuple3fGrid t, float w, float px, float py, float pz, ! float pw) { assert px > 0f && py > 0f && pz > 0f && pw > 0f; float nw = w > 0 ? w % pw : (-w) % pw; *************** *** 1307,1321 **** public void cellnoise(FloatGrid x, FloatGrid y, FloatGrid z, float w) { for (int i = 0; i < size; i++) ! data[i] = PerlinNoise.cellnoise4d(x.data[i], y.data[i], z.data[i], w); } public void cellnoise(Tuple3fGrid t) { for (int i = 0; i < size; i++) ! data[i] = PerlinNoise.cellnoise3d(t.data[i].x, t.data[i].y, t.data[i].z); } public void cellnoise(Tuple3fGrid t, float w) { for (int i = 0; i < size; i++) ! data[i] = PerlinNoise.cellnoise4d(t.data[i].x, t.data[i].y, t.data[i].z, w); } --- 1328,1345 ---- public void cellnoise(FloatGrid x, FloatGrid y, FloatGrid z, float w) { for (int i = 0; i < size; i++) ! data[i] = PerlinNoise.cellnoise4d ! (x.data[i], y.data[i], z.data[i], w); } public void cellnoise(Tuple3fGrid t) { for (int i = 0; i < size; i++) ! data[i] = PerlinNoise.cellnoise3d ! (t.data[i].x, t.data[i].y, t.data[i].z); } public void cellnoise(Tuple3fGrid t, float w) { for (int i = 0; i < size; i++) ! data[i] = PerlinNoise.cellnoise4d ! (t.data[i].x, t.data[i].y, t.data[i].z, w); } *************** *** 1530,1534 **** */ ! public void texture(String textureName, FloatGrid s, FloatGrid t, float blur, int band) { MipMap texture = MipMap.getMipMap(textureName); for (int v = 0; v < vSize; v++) --- 1554,1559 ---- */ ! public void texture(String textureName, FloatGrid s, FloatGrid t, ! float blur, int band) { MipMap texture = MipMap.getMipMap(textureName); for (int v = 0; v < vSize; v++) *************** *** 1541,1552 **** v1 = v - 1; float area = ! ((s.get(u, v) + s.get(u1, v)) * (t.get(u, v) - t.get(u1, v)) ! + (s.get(u1, v) + s.get(u1, v1)) * (t.get(u1, v) - t.get(u1, v1)) ! + (s.get(u1, v1) + s.get(u, v1)) * (t.get(u1, v1) - t.get(u, v1)) ! + (s.get(u, v1) + s.get(u, v)) * (t.get(u, v1) - t.get(u, v))) / 2f; area = Math.abs(area) + blur; ! float avgS = (s.get(u, v) + s.get(u1, v) + s.get(u1, v1) + s.get(u, v1)) / 4f; ! float avgT = (t.get(u, v) + t.get(u1, v) + t.get(u1, v1) + t.get(u, v1)) / 4f; set(u, v, getFloat(texture, avgS, avgT, area, band)); } --- 1566,1583 ---- v1 = v - 1; float area = ! ((s.get(u, v) + s.get(u1, v)) * ! (t.get(u, v) - t.get(u1, v)) ! + (s.get(u1, v) + s.get(u1, v1)) * ! (t.get(u1, v) - t.get(u1, v1)) ! + (s.get(u1, v1) + s.get(u, v1)) * ! (t.get(u1, v1) - t.get(u, v1)) ! + (s.get(u, v1) + s.get(u, v)) * ! (t.get(u, v1) - t.get(u, v))) / 2f; area = Math.abs(area) + blur; ! float avgS = (s.get(u, v) + s.get(u1, v) + ! s.get(u1, v1) + s.get(u, v1)) / 4f; ! float avgT = (t.get(u, v) + t.get(u1, v) + ! t.get(u1, v1) + t.get(u, v1)) / 4f; set(u, v, getFloat(texture, avgS, avgT, area, band)); } *************** *** 1581,1585 **** u, v, ! shadowMap.get(p1, p2, bias, isamples, oneOverSamples, blur, halfBlur)); } } --- 1612,1617 ---- u, v, ! shadowMap.get ! (p1, p2, bias, isamples, oneOverSamples, blur, halfBlur)); } } |
|
From: Elmer G. <ega...@us...> - 2005-12-14 01:08:57
|
Update of /cvsroot/jrman/drafts/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20743/src Added Files: DisplacementDisp_textured.java Log Message: Added missing file --- NEW FILE: DisplacementDisp_textured.java --- /* DisplacementDisp_textured.java Copyright (C) 2003 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. */ import org.jrman.grid.FloatGrid; import org.jrman.grid.Point3fGrid; import org.jrman.grid.Vector3fGrid; import org.jrman.parameters.Declaration; import org.jrman.parameters.UniformScalarFloat; import org.jrman.parameters.UniformScalarString; import org.jrman.render.ShaderVariables; import org.jrman.shaders.DisplacementShader; public class DisplacementDisp_textured extends DisplacementShader { private static FloatGrid fg1 = new FloatGrid(); private static Vector3fGrid Nn = new Vector3fGrid(); private static Point3fGrid P2 = new Point3fGrid(); protected void initDefaults() { defaultParameters.addParameter( new UniformScalarFloat(new Declaration("Km", "uniform float"), 1f)); defaultParameters.addParameter( new UniformScalarString(new Declaration("texturename", "string"), "")); defaultParameters.addParameter( new UniformScalarFloat(new Declaration("blur", "uniform float"), 0f)); } public void shade(ShaderVariables sv) { super.shade(sv); UniformScalarFloat paramKm = (UniformScalarFloat) getParameter(sv, "Km"); float Km = paramKm.getValue(); UniformScalarFloat paramMinU = (UniformScalarFloat) getParameter(sv, "min_u"); float min_u = paramMinU.getValue(); UniformScalarFloat paramMaxU = (UniformScalarFloat) getParameter(sv, "max_u"); float max_u = paramMaxU.getValue(); UniformScalarFloat paramMinV = (UniformScalarFloat) getParameter(sv, "min_v"); float min_v = paramMinV.getValue(); UniformScalarFloat paramMaxV = (UniformScalarFloat) getParameter(sv, "max_v"); float max_v = paramMaxV.getValue(); UniformScalarString paramTexturename = (UniformScalarString) getParameter(sv, "mapname"); String texturename = paramTexturename.getValue(); UniformScalarFloat paramBlur = (UniformScalarFloat) getParameter(sv, "blur"); float blur = paramBlur.getValue(); sv.u.sub(sv.u, min_u); sv.u.div(sv.u, (max_u - min_u)); sv.v.sub(sv.v, min_v); sv.v.div(sv.v, (max_v - min_v)); if (!texturename.equals("")) fg1.texture(texturename, sv.u, sv.v, blur, 0); else fg1.set(0f); fg1.mul(fg1, 2f); fg1.sub(fg1, 1f); fg1.mul(fg1, Km); Nn.normalize(sv.N); P2.set(fg1); P2.mul(P2, Nn); sv.P.add(P2, sv.P); calculatenormal(sv, sv.P, sv.N); } } |
|
From: Elmer G. <ega...@us...> - 2005-12-13 22:45:28
|
Update of /cvsroot/jrman/drafts/sampleData/killeroo-textures In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14908/killeroo-textures Added Files: disp_textured.sl Log Message: Added shader file --- NEW FILE: disp_textured.sl --- displacement disp_textured( float Km = 1.0, min_u = 0.0, max_u = 1.0, min_v = 0.0, max_v = 1.0; string mapname = "") { float magnitude, hlevel; if( mapname != "") { level = float texture( mapname, (u - min_u) / (max_u - min_u), (v - min_v) / (max_v - min_v), "swidth", 0.0001, "twidth", 0.0001, "samples", 1); magnitude = ((level * 2) - 1) * Km; } else { magnitude = 0.0; } P += normalize( N) * magnitude; N = calculatenormal( P); } |
|
From: Elmer G. <ega...@us...> - 2005-12-13 22:44:11
|
Update of /cvsroot/jrman/drafts/sampleData In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13469 Modified Files: headus.com-killeroo.rib Log Message: Added killero-textures Index: headus.com-killeroo.rib =================================================================== RCS file: /cvsroot/jrman/drafts/sampleData/headus.com-killeroo.rib,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** headus.com-killeroo.rib 12 Dec 2005 13:42:27 -0000 1.2 --- headus.com-killeroo.rib 13 Dec 2005 22:43:57 -0000 1.3 *************** *** 2,5 **** --- 2,96 ---- ##Creator iges2rib v1.0 2000/02/12 12:11:45 ## This file is included with permission of http://www.headus.com/ + + MakeTexture "killeroo-textures/pat344_0.12.jpg" "killeroo-textures/pat344_0.12.txr" "clamp" "clamp" "gaussian" 2 2 + MakeTexture "killeroo-textures/pat345_0.23.jpg" "killeroo-textures/pat345_0.23.txr" "clamp" "clamp" "gaussian" 2 2 + MakeTexture "killeroo-textures/pat346_0.4.jpg" "killeroo-textures/pat346_0.4.txr" "clamp" "clamp" "gaussian" 2 2 + MakeTexture "killeroo-textures/pat347_0.34.jpg" "killeroo-textures/pat347_0.34.txr" "clamp" "clamp" "gaussian" 2 2 + MakeTexture "killeroo-textures/pat348_0.48.jpg" "killeroo-textures/pat348_0.48.txr" "clamp" "clamp" "gaussian" 2 2 + MakeTexture "killeroo-textures/pat349_0.2.jpg" "killeroo-textures/pat349_0.2.txr" "clamp" "clamp" "gaussian" 2 2 [...1223 lines suppressed...] #Attribute "render" "truedisplacement" [1] --- 6390,6394 ---- #Attribute "render" "truedisplacement" [0] Surface "matte" "Ka" 0 "Kd" 1 ! Displacement "disp_textured" "Km" 0.5 "mapname" ["killeroo-textures/pat3_0.5.txr"] "min_u" 0 "max_u" 7 "min_v" 0 "max_v" 4 Attribute "displacementbound" "coordinatesystem" ["world"] "sphere" [1] #Attribute "render" "truedisplacement" [1] *************** *** 6329,6333 **** #Attribute "render" "truedisplacement" [0] Surface "matte" "Ka" 0 "Kd" 1 ! Displacement "disp_textured" "Km" 0.35 "mapname" ["killeroo-textures/Maps-new/pat4_0.35.txr"] "min_u" 0 "max_u" 4 "min_v" 0 "max_v" 7 Attribute "displacementbound" "coordinatesystem" ["world"] "sphere" [0.7] #Attribute "render" "truedisplacement" [1] --- 6420,6424 ---- #Attribute "render" "truedisplacement" [0] Surface "matte" "Ka" 0 "Kd" 1 ! Displacement "disp_textured" "Km" 0.35 "mapname" ["killeroo-textures/pat4_0.35.txr"] "min_u" 0 "max_u" 4 "min_v" 0 "max_v" 7 Attribute "displacementbound" "coordinatesystem" ["world"] "sphere" [0.7] #Attribute "render" "truedisplacement" [1] |
Update of /cvsroot/jrman/drafts/sampleData/killeroo-textures In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13469/killeroo-textures Added Files: pat006_0.4.jpg pat043_0.21.jpg pat075_0.36.jpg pat076_0.5.jpg pat090_0.52.jpg pat095_0.26.jpg pat096_0.23.jpg pat097_0.6.jpg pat098_0.68.jpg pat099_1.1.jpg pat100_0.49.jpg pat101_0.31.jpg pat102_0.37.jpg pat119_0.32.jpg pat120_0.46.jpg pat121_1.3.jpg pat122_1.1.jpg pat123_0.46.jpg pat124_0.71.jpg pat125_0.86.jpg pat126_0.43.jpg pat127_0.77.jpg pat128_0.99.jpg pat171_0.64.jpg pat172_0.36.jpg pat173_0.25.jpg pat174_0.34.jpg pat199_1.6.jpg pat200_0.89.jpg pat202_1.5.jpg pat203_1.4.jpg pat229_0.3.jpg pat292_0.23.jpg pat2_0.22.jpg pat301_0.41.jpg pat302_0.52.jpg pat304_0.53.jpg pat305_0.26.jpg pat329_0.36.jpg pat330_0.52.jpg pat344_0.12.jpg pat345_0.23.jpg pat346_0.4.jpg pat347_0.34.jpg pat348_0.48.jpg pat349_0.2.jpg pat350_0.32.jpg pat351_0.66.jpg pat352_0.65.jpg pat353_0.31.jpg pat354_0.63.jpg pat355_0.21.jpg pat356_0.44.jpg pat373_0.25.jpg pat374_0.36.jpg pat375_0.47.jpg pat376_0.24.jpg pat377_0.21.jpg pat378_0.2.jpg pat379_0.38.jpg pat380_0.34.jpg pat381_0.44.jpg pat382_0.38.jpg pat3_0.5.jpg pat440_0.84.jpg pat441_1.5.jpg pat446_1.3.jpg pat447_1.4.jpg pat449_1.3.jpg pat450_0.69.jpg pat451_0.64.jpg pat452_0.62.jpg pat453_0.7.jpg pat454_0.41.jpg pat458_0.23.jpg pat459_0.41.jpg pat460_0.44.jpg pat464_0.6.jpg pat465_0.6.jpg pat466_0.55.jpg pat467_0.58.jpg pat470_1.1.jpg pat479_1.2.jpg pat489_0.77.jpg pat490_0.74.jpg pat4_0.35.jpg pat_0.39.jpg sti12_1.1.jpg sti2_0.88.jpg Log Message: Added killero-textures --- NEW FILE: pat449_1.3.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat075_0.36.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat_0.39.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat203_1.4.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat355_0.21.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat349_0.2.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat329_0.36.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat490_0.74.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat171_0.64.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat2_0.22.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat470_1.1.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat304_0.53.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat330_0.52.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat095_0.26.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat098_0.68.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat379_0.38.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat346_0.4.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat172_0.36.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat447_1.4.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat302_0.52.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat351_0.66.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat292_0.23.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat350_0.32.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat121_1.3.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat377_0.21.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat199_1.6.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat102_0.37.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat450_0.69.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat006_0.4.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat090_0.52.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat345_0.23.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat125_0.86.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: sti2_0.88.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat128_0.99.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat100_0.49.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat373_0.25.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat374_0.36.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat489_0.77.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat452_0.62.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat076_0.5.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat382_0.38.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat458_0.23.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat467_0.58.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: sti12_1.1.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat348_0.48.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat441_1.5.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat4_0.35.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat352_0.65.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat122_1.1.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat101_0.31.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat375_0.47.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat229_0.3.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat124_0.71.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat376_0.24.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat353_0.31.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat453_0.7.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat099_1.1.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat378_0.2.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat454_0.41.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat123_0.46.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat174_0.34.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat464_0.6.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat479_1.2.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat344_0.12.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat127_0.77.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat460_0.44.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat440_0.84.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat202_1.5.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat465_0.6.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat459_0.41.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat354_0.63.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat126_0.43.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat043_0.21.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat173_0.25.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat3_0.5.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat096_0.23.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat356_0.44.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat466_0.55.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat380_0.34.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat381_0.44.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat301_0.41.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat097_0.6.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat451_0.64.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat200_0.89.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat120_0.46.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat305_0.26.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat347_0.34.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat446_1.3.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pat119_0.32.jpg --- (This appears to be a binary file; contents omitted.) |
|
From: Elmer G. <ega...@us...> - 2005-12-13 22:33:02
|
Update of /cvsroot/jrman/drafts/sampleData/killeroo-textures In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10825/sampleData/killeroo-textures Log Message: Directory /cvsroot/jrman/drafts/sampleData/killeroo-textures added to the repository |
|
From: Elmer G. <ega...@us...> - 2005-12-12 13:42:36
|
Update of /cvsroot/jrman/drafts/sampleData In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12790 Modified Files: headus.com-killeroo.rib Log Message: Changed textures names Index: headus.com-killeroo.rib =================================================================== RCS file: /cvsroot/jrman/drafts/sampleData/headus.com-killeroo.rib,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** headus.com-killeroo.rib 7 Dec 2005 06:24:23 -0000 1.1 --- headus.com-killeroo.rib 12 Dec 2005 13:42:27 -0000 1.2 *************** *** 4,9 **** #Option "searchpath" "shader" ["&:/usr/staff/revel/architec/products/headus/lib/shaders"] FrameBegin 1 ! Display "killeroo.0001" "framebuffer" "rgba" ! PixelSamples 4 4 Exposure 1 1.8 #Imager "background" "background" [ 1.0 1.0 1.0 ] --- 4,9 ---- #Option "searchpath" "shader" ["&:/usr/staff/revel/architec/products/headus/lib/shaders"] FrameBegin 1 ! Display "killeroo" "framebuffer" "rgba" [...1508 lines suppressed...] ! Attribute "displacementbound" "coordinatesystem" ["world"] "sphere" [1] #Attribute "render" "truedisplacement" [1] NuPatch 10 4 [ 0 0 0 0 1 2 3 4 5 6 7 7 7 7 ] 0 7 7 4 [ 0 0 0 0 1 2 3 4 4 4 4 ] 0 4 "Pw" [ *************** *** 6331,6337 **** -23.2892 42.9644 -136.374 1 ] #Attribute "render" "truedisplacement" [0] ! #Surface "matte" "Ka" 0 "Kd" 1 ! #Displacement "disp_textured" "Km" 0.35 "mapname" ["Maps-new/pat4_0.35.mip"] "min_u" 0 "max_u" 4 "min_v" 0 "max_v" 7 ! #Attribute "displacementbound" "coordinatesystem" ["world"] "sphere" [0.7] #Attribute "render" "truedisplacement" [1] NuPatch 7 4 [ 0 0 0 0 1 2 3 4 4 4 4 ] 0 4 10 4 [ 0 0 0 0 1 2 3 4 5 6 7 7 7 7 ] 0 7 "Pw" [ --- 6328,6334 ---- -23.2892 42.9644 -136.374 1 ] #Attribute "render" "truedisplacement" [0] ! Surface "matte" "Ka" 0 "Kd" 1 ! Displacement "disp_textured" "Km" 0.35 "mapname" ["killeroo-textures/Maps-new/pat4_0.35.txr"] "min_u" 0 "max_u" 4 "min_v" 0 "max_v" 7 ! Attribute "displacementbound" "coordinatesystem" ["world"] "sphere" [0.7] #Attribute "render" "truedisplacement" [1] NuPatch 7 4 [ 0 0 0 0 1 2 3 4 4 4 4 ] 0 4 10 4 [ 0 0 0 0 1 2 3 4 5 6 7 7 7 7 ] 0 7 "Pw" [ |
|
From: Elmer G. <ega...@us...> - 2005-12-07 06:24:33
|
Update of /cvsroot/jrman/drafts/sampleData In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7267/sampleData Added Files: headus.com-killeroo.rib Log Message: added new nurbs sample data --- NEW FILE: headus.com-killeroo.rib --- ##RenderMan RIB-Structure 1.0 ##Creator iges2rib v1.0 2000/02/12 12:11:45 ## This file is included with permission of http://www.headus.com/ #Option "searchpath" "shader" ["&:/usr/staff/revel/architec/products/headus/lib/shaders"] FrameBegin 1 Display "killeroo.0001" "framebuffer" "rgba" PixelSamples 4 4 Exposure 1 1.8 #Imager "background" "background" [ 1.0 1.0 1.0 ] Format 796 515 1 Projection "perspective" "fov" [ 29.1143 ] Transform [ 1 0 0 0 0 0 1 0 0 1 0 0 0 0 0 1 ] Translate 0 453.87 0 Rotate 0 0 1 0 Rotate 11.5 1 0 0 Rotate -238.5 0 0 1 Translate -19.0565 12.7217 55.7731 Clipping 30.258 3025.8 WorldBegin [...6326 lines suppressed...] -24.5139 39.1609 -134.789 1 -24.3957 41.4574 -135.225 1 -23.7811 42.8132 -135.831 1 -23.2915 42.9632 -136.368 1 -25.4877 36.4694 -136.104 1 -25.3183 37.2539 -136.061 1 -25.4204 38.1357 -135.948 1 -24.8072 39.2556 -135.735 1 -24.6162 41.4112 -135.99 1 -23.876 42.8559 -136.126 1 -23.2919 42.9635 -136.37 1 -25.6621 37.5232 -137.14 1 -25.5293 38.154 -137.063 1 -25.229 38.9053 -136.942 1 -24.7405 39.445 -136.658 1 -24.5637 41.516 -136.734 1 -23.8564 42.911 -136.422 1 -23.2918 42.9637 -136.371 1 -24.8519 37.616 -138.063 1 -24.8877 38.3095 -138.011 1 -25.1116 39.1135 -138.096 1 -24.4325 39.7128 -137.33 1 -24.3143 41.7429 -137.305 1 -23.7526 42.9647 -136.657 1 -23.2913 42.964 -136.372 1 -23.9859 37.681 -138.733 1 -24.0364 38.3661 -138.626 1 -24.0525 39.1749 -138.608 1 -24.0841 40.0635 -137.818 1 -23.9585 42.0529 -137.684 1 -23.6018 43.0109 -136.822 1 -23.2906 42.9642 -136.373 1 -23.4878 37.4687 -138.985 1 -23.5246 38.1706 -138.863 1 -23.6022 38.989 -138.748 1 -23.7349 40.5034 -138.199 1 -23.6199 42.3806 -137.843 1 -23.4554 43.0416 -136.904 1 -23.2898 42.9644 -136.374 1 -22.923 37.411 -139.008 1 -23.089 38.128 -138.881 1 -23.1153 38.9467 -138.815 1 -23.3059 40.5283 -138.202 1 -23.2739 42.3562 -137.793 1 -23.3192 43.0522 -136.88 1 -23.2892 42.9644 -136.374 1 ] #Attribute "render" "truedisplacement" [0] AttributeEnd WorldEnd FrameEnd |
