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
|
|
From: Gerardo H. <ma...@us...> - 2007-02-20 05:07:12
|
Update of /cvsroot/jrman/drafts/sampleData In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv4481/sampleData Modified Files: headus.com-killeroo.rib Log Message: Nicer clouds. Index: headus.com-killeroo.rib =================================================================== RCS file: /cvsroot/jrman/drafts/sampleData/headus.com-killeroo.rib,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** headus.com-killeroo.rib 20 Feb 2007 04:22:13 -0000 1.13 --- headus.com-killeroo.rib 20 Feb 2007 05:07:06 -0000 1.14 *************** *** 148,152 **** PixelSamples 8 8 Exposure 1 2.2 - #Imager "background" "background" [ 1.0 1.0 1.0 ] #Format 950 614 1 Format 1900 1228 1 --- 148,151 ---- *************** *** 164,167 **** --- 163,167 ---- Rotate -90 1 0 0 AttributeBegin + TextureCoordinates 0 0 5 0 0 5 5 5 Surface "paintedplastic" "Ks" 0 "texturename" "killeroo-textures/clouds.txr" Sphere 2000 -2000 2000 360 |
|
From: Gerardo H. <ma...@us...> - 2007-02-20 04:22:16
|
Update of /cvsroot/jrman/drafts/sampleData/killeroo-textures In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv16296/sampleData/killeroo-textures Added Files: clouds.jpg Log Message: Added clouds background to killeroos. --- NEW FILE: clouds.jpg --- (This appears to be a binary file; contents omitted.) |
|
From: Gerardo H. <ma...@us...> - 2007-02-20 04:22:16
|
Update of /cvsroot/jrman/drafts/sampleData In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv16296/sampleData Modified Files: headus.com-killeroo.rib Log Message: Added clouds background to killeroos. Index: headus.com-killeroo.rib =================================================================== RCS file: /cvsroot/jrman/drafts/sampleData/headus.com-killeroo.rib,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** headus.com-killeroo.rib 20 Feb 2007 03:58:53 -0000 1.12 --- headus.com-killeroo.rib 20 Feb 2007 04:22:13 -0000 1.13 *************** *** 92,95 **** --- 92,96 ---- MakeTexture "killeroo-textures/pat329_0.36.jpg" "killeroo-textures/pat329_0.36.txr" "clamp" "clamp" "gaussian" 2 2 MakeTexture "killeroo-textures/pat330_0.52.jpg" "killeroo-textures/pat330_0.52.txr" "clamp" "clamp" "gaussian" 2 2 + MakeTexture "killeroo-textures/clouds.jpg" "killeroo-textures/clouds.txr" "periodic" "periodic" "gaussian" 2 2 FrameBegin 1 *************** *** 163,168 **** Rotate -90 1 0 0 AttributeBegin ! Color .8 .8 1 ! Sphere 5000 -5000 5000 360 AttributeEnd TransformBegin --- 164,169 ---- Rotate -90 1 0 0 AttributeBegin ! Surface "paintedplastic" "Ks" 0 "texturename" "killeroo-textures/clouds.txr" ! Sphere 2000 -2000 2000 360 AttributeEnd TransformBegin |
|
From: Gerardo H. <ma...@us...> - 2007-02-20 03:58:58
|
Update of /cvsroot/jrman/drafts/sampleData In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv5442/sampleData Modified Files: headus.com-killeroo.rib Log Message: Larger killeroo image (so details can be seen). Index: headus.com-killeroo.rib =================================================================== RCS file: /cvsroot/jrman/drafts/sampleData/headus.com-killeroo.rib,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** headus.com-killeroo.rib 20 Feb 2007 00:05:01 -0000 1.11 --- headus.com-killeroo.rib 20 Feb 2007 03:58:53 -0000 1.12 *************** *** 148,152 **** Exposure 1 2.2 #Imager "background" "background" [ 1.0 1.0 1.0 ] ! Format 950 614 1 Projection "perspective" "fov" [ 17 ] Rotate 5 0 1 0 --- 148,153 ---- Exposure 1 2.2 #Imager "background" "background" [ 1.0 1.0 1.0 ] ! #Format 950 614 1 ! Format 1900 1228 1 Projection "perspective" "fov" [ 17 ] Rotate 5 0 1 0 |
|
From: Gerardo H. <ma...@us...> - 2007-02-20 03:33:40
|
Update of /cvsroot/jrman/drafts In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv27529 Modified Files: build.xml Log Message: Fixed micropolygons memory leak. Index: build.xml =================================================================== RCS file: /cvsroot/jrman/drafts/build.xml,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** build.xml 4 Feb 2007 06:02:26 -0000 1.23 --- build.xml 20 Feb 2007 03:33:35 -0000 1.24 *************** *** 27,31 **** description="compile the source " > <!-- Compile the java code from ${src} into ${build} --> ! <javac srcdir="${src}" destdir="${build}" source="1.4" debug="on"> <classpath refid="project.class.path"/> </javac> --- 27,32 ---- description="compile the source " > <!-- Compile the java code from ${src} into ${build} --> ! <javac srcdir="${src}" destdir="${build}" source="1.4" target="1.4" ! debug="on"> <classpath refid="project.class.path"/> </javac> *************** *** 172,177 **** <include name="shadowTest.rib"/> <include name="noiseShadersTest.rib"/> </fileset> ! </copy> </target> --- 173,182 ---- <include name="shadowTest.rib"/> <include name="noiseShadersTest.rib"/> + <include name="headus.com-killeroo.rib"/> + <include name="killeroo-data.rib"/> + <include name="grass-data.rib"/> + <include name="killeroo-textures/*.jpg"/> </fileset> ! </copy> </target> |
|
From: Gerardo H. <ma...@us...> - 2007-02-20 03:33:40
|
Update of /cvsroot/jrman/drafts/src/org/jrman/render In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv27529/src/org/jrman/render Modified Files: MemoryBucket.java RendererHidden.java Added Files: DummyBucket.java Log Message: Fixed micropolygons memory leak. Index: RendererHidden.java =================================================================== RCS file: /cvsroot/jrman/drafts/src/org/jrman/render/RendererHidden.java,v retrieving revision 1.77 retrieving revision 1.78 diff -C2 -d -r1.77 -r1.78 *** RendererHidden.java 1 Feb 2007 20:30:14 -0000 1.77 --- RendererHidden.java 20 Feb 2007 03:33:36 -0000 1.78 *************** *** 287,291 **** private void discardBucket(int column, int row) { ! buckets[row * bucketColumns + column] = null; } --- 287,291 ---- private void discardBucket(int column, int row) { ! buckets[row * bucketColumns + column] = DummyBucket.UNIQUE; } --- NEW FILE: DummyBucket.java --- /* DummyBucket.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. */ package org.jrman.render; import java.util.Arrays; import org.jrman.primitive.Primitive; public class DummyBucket implements Bucket { public final static Bucket UNIQUE = new DummyBucket(); private DummyBucket() { } public void addPrimitive(Primitive primitive) { } public boolean hasMorePrimitives() { return false; } public Primitive getNextPrimitive() { throw new RuntimeException("No primitives in dummy bucket!"); } public void sortPrimitives() { } public void sortMicropolygons() { } public void addMicropolygon(Micropolygon mp) { } public boolean hasMoreMicropolygons() { return false; } public Micropolygon getNextMicropolygon() { throw new RuntimeException("No micropolygons in dummy bucket!"); } } Index: MemoryBucket.java =================================================================== RCS file: /cvsroot/jrman/drafts/src/org/jrman/render/MemoryBucket.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** MemoryBucket.java 1 Feb 2007 20:30:14 -0000 1.11 --- MemoryBucket.java 20 Feb 2007 03:33:36 -0000 1.12 *************** *** 36,48 **** private boolean primitivesModified; - private boolean flushed; - private boolean micropolygonsModified; ! public MemoryBucket() { } public void addPrimitive(Primitive primitive) { ! if (primitiveCount == primitives.length) { Primitive[] tmp; if (primitiveCount == 0) --- 36,46 ---- private boolean primitivesModified; private boolean micropolygonsModified; ! public MemoryBucket() { } public void addPrimitive(Primitive primitive) { ! if (primitiveCount == primitives.length) { Primitive[] tmp; if (primitiveCount == 0) *************** *** 82,87 **** public void addMicropolygon(Micropolygon mp) { - if (flushed) - return; if (micropolygonCount == micropolygons.length) { Micropolygon[] tmp; --- 80,83 ---- |
|
From: Gerardo H. <ma...@us...> - 2007-02-20 03:33:40
|
Update of /cvsroot/jrman/drafts/src/org/jrman/parser In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv27529/src/org/jrman/parser Modified Files: Tokenizer.java Log Message: Fixed micropolygons memory leak. Index: Tokenizer.java =================================================================== RCS file: /cvsroot/jrman/drafts/src/org/jrman/parser/Tokenizer.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Tokenizer.java 6 Jul 2005 22:53:25 -0000 1.4 --- Tokenizer.java 20 Feb 2007 03:33:36 -0000 1.5 *************** *** 226,228 **** } ! } \ No newline at end of file --- 226,228 ---- } ! } |
|
From: Gerardo H. <ma...@us...> - 2007-02-20 00:05:05
|
Update of /cvsroot/jrman/drafts/sampleData In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv21907 Modified Files: headus.com-killeroo.rib Log Message: Undid last test. Index: headus.com-killeroo.rib =================================================================== RCS file: /cvsroot/jrman/drafts/sampleData/headus.com-killeroo.rib,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** headus.com-killeroo.rib 19 Feb 2007 23:46:40 -0000 1.10 --- headus.com-killeroo.rib 20 Feb 2007 00:05:01 -0000 1.11 *************** *** 163,167 **** AttributeBegin Color .8 .8 1 - #Surface "turbulence" "uniform float noisescale" 20000 "uniform integer noiseoctaves" 5 Sphere 5000 -5000 5000 360 AttributeEnd --- 163,166 ---- |
|
From: Gerardo H. <ma...@us...> - 2007-02-19 23:46:44
|
Update of /cvsroot/jrman/drafts/sampleData In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv12790 Modified Files: headus.com-killeroo.rib Log Message: Removed light from shadow map generation. Index: headus.com-killeroo.rib =================================================================== RCS file: /cvsroot/jrman/drafts/sampleData/headus.com-killeroo.rib,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** headus.com-killeroo.rib 19 Feb 2007 23:43:39 -0000 1.9 --- headus.com-killeroo.rib 19 Feb 2007 23:46:40 -0000 1.10 *************** *** 101,105 **** Projection "orthographic" ScreenWindow -700 300 -200 512 ! LightSource "distantlight" 10 "intensity" 1 Clipping 4000 8000 Translate 0 0 5000 --- 101,105 ---- Projection "orthographic" ScreenWindow -700 300 -200 512 ! #LightSource "distantlight" 10 "intensity" 1 Clipping 4000 8000 Translate 0 0 5000 |
|
From: Gerardo H. <ma...@us...> - 2007-02-19 23:43:42
|
Update of /cvsroot/jrman/drafts/sampleData In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv11305 Modified Files: headus.com-killeroo.rib Log Message: Fixed shadows in killeroos scene. Index: headus.com-killeroo.rib =================================================================== RCS file: /cvsroot/jrman/drafts/sampleData/headus.com-killeroo.rib,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** headus.com-killeroo.rib 19 Feb 2007 05:00:12 -0000 1.8 --- headus.com-killeroo.rib 19 Feb 2007 23:43:39 -0000 1.9 *************** *** 101,108 **** Projection "orthographic" ScreenWindow -700 300 -200 512 ! #LightSource "distantlight" 10 "intensity" 1 Clipping 4000 8000 Translate 0 0 5000 ! Rotate -35.264389683 0 0 1 Rotate -45 0 1 0 WorldBegin --- 101,108 ---- Projection "orthographic" ScreenWindow -700 300 -200 512 ! LightSource "distantlight" 10 "intensity" 1 Clipping 4000 8000 Translate 0 0 5000 ! Rotate -35.264389683 1 0 0 Rotate -45 0 1 0 WorldBegin |
|
From: Gerardo H. <ma...@us...> - 2007-02-19 23:27:49
|
Update of /cvsroot/jrman/drafts/sampleData In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv3470 Modified Files: noiseShadersTest.rib Log Message: Fixed shadows in noiseShadersTest.rib Index: noiseShadersTest.rib =================================================================== RCS file: /cvsroot/jrman/drafts/sampleData/noiseShadersTest.rib,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** noiseShadersTest.rib 6 Dec 2005 02:33:37 -0000 1.6 --- noiseShadersTest.rib 19 Feb 2007 23:27:43 -0000 1.7 *************** *** 6,10 **** Clipping 1 20 Translate 0 0 10 ! Rotate -35.264389683 0 0 1 Rotate 45 0 1 0 WorldBegin --- 6,10 ---- Clipping 1 20 Translate 0 0 10 ! Rotate -35.264389683 1 0 0 Rotate 45 0 1 0 WorldBegin |
|
From: Gerardo H. <ma...@us...> - 2007-02-19 05:00:23
|
Update of /cvsroot/jrman/drafts/sampleData In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv12842 Modified Files: headus.com-killeroo.rib Log Message: Ttrying to make Killeroo image more interesting. Index: headus.com-killeroo.rib =================================================================== RCS file: /cvsroot/jrman/drafts/sampleData/headus.com-killeroo.rib,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** headus.com-killeroo.rib 17 Feb 2007 03:50:26 -0000 1.7 --- headus.com-killeroo.rib 19 Feb 2007 05:00:12 -0000 1.8 *************** *** 93,115 **** MakeTexture "killeroo-textures/pat330_0.52.jpg" "killeroo-textures/pat330_0.52.txr" "clamp" "clamp" "gaussian" 2 2 - #Option "searchpath" "shader" ["&:/usr/staff/revel/architec/products/headus/lib/shaders"] FrameBegin 1 Display "killeroo" "framebuffer" "rgba" PixelSamples 8 8 ! Exposure 1 1.8 #Imager "background" "background" [ 1.0 1.0 1.0 ] ! Format 796 515 1 Projection "perspective" "fov" [ 17 ] - LightSource "distantlight" 1 "intensity" 0.8 "from" [0 1 0] "to" [0 0 0] - LightSource "ambientlight" 2 "intensity" 0.2 Rotate 5 0 1 0 Translate 0 10 1000 Rotate -10 1 0 0 Rotate 50 0 1 0 Rotate -90 1 0 0 ! WorldBegin ! #ShadingRate .25 ! Color 0 0 .7 ! Sphere 10000 -10000 10000 360 TransformBegin Translate -400 -100 0 --- 93,169 ---- MakeTexture "killeroo-textures/pat330_0.52.jpg" "killeroo-textures/pat330_0.52.txr" "clamp" "clamp" "gaussian" 2 2 FrameBegin 1 + Format 1024 1024 1 + Display "killeroo.shdw" "file" "z" + #Display "killeroo.shdw" "framebuffer" "rgb" + PixelSamples 1 1 + PixelFilter "box" 1 1 + Projection "orthographic" + ScreenWindow -700 300 -200 512 + #LightSource "distantlight" 10 "intensity" 1 + Clipping 4000 8000 + Translate 0 0 5000 + Rotate -35.264389683 0 0 1 + Rotate -45 0 1 0 + WorldBegin + Rotate -10 1 0 0 + Rotate 50 0 1 0 + Rotate -90 1 0 0 + TransformBegin + Translate -400 -100 0 + Rotate -90 0 0 1 + ReadArchive "killeroo-data.rib" + TransformEnd + TransformBegin + Translate -300 150 0 + Rotate -120 0 0 1 + ReadArchive "killeroo-data.rib" + TransformEnd + AttributeBegin + Color 1 1 1 + Translate -100 -100 -99 + Sphere 50 -50 50 360 + AttributeEnd + TransformBegin + Translate -200 -200 -149 + Rotate 90 1 0 0 + Scale 10 10 10 + ReadArchive "grass-data.rib" + TransformEnd + WorldEnd + FrameEnd + + + + Declare "shadowmap" "string" + Declare "bias" "uniform float" + Declare "samples" "uniform float" + Declare "blur" "uniform float" + + FrameBegin 2 + Display "grass.png" "framebuffer" "rgb" + PixelFilter "gaussian" 2 2 Display "killeroo" "framebuffer" "rgba" PixelSamples 8 8 ! Exposure 1 2.2 #Imager "background" "background" [ 1.0 1.0 1.0 ] ! Format 950 614 1 Projection "perspective" "fov" [ 17 ] Rotate 5 0 1 0 Translate 0 10 1000 + LightSource "shadowdistantlight" 1 "from" [-1 1 -1] "to" [0 0 0] + "intensity" [0.7] + "shadowmap" "killeroo.shdw" "bias" 20 "samples" 64 "blur" 8 + LightSource "distantlight" 2 "from" [1 0 -.2] "to" [0 0 0] "intensity" [0.1] "lightcolor" [1 1 1] + WorldBegin + ShadingRate .25 Rotate -10 1 0 0 Rotate 50 0 1 0 Rotate -90 1 0 0 ! AttributeBegin ! Color .8 .8 1 ! #Surface "turbulence" "uniform float noisescale" 20000 "uniform integer noiseoctaves" 5 ! Sphere 5000 -5000 5000 360 ! AttributeEnd TransformBegin Translate -400 -100 0 *************** *** 118,121 **** --- 172,186 ---- TransformEnd TransformBegin + Translate -300 150 0 + Rotate -120 0 0 1 + ReadArchive "killeroo-data.rib" + TransformEnd + AttributeBegin + Surface "Matte" + Color 1 1 1 + Translate -100 -100 -99 + Sphere 50 -50 50 360 + AttributeEnd + TransformBegin Translate -200 -200 -149 Rotate 90 1 0 0 *************** *** 124,126 **** TransformEnd WorldEnd ! FrameEnd --- 189,191 ---- TransformEnd WorldEnd ! FrameEnd \ No newline at end of file |
|
From: Elmer G. <ega...@us...> - 2007-02-17 03:50:32
|
Update of /cvsroot/jrman/drafts/sampleData In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv547/sampleData Modified Files: headus.com-killeroo.rib Log Message: Updated image composition Index: headus.com-killeroo.rib =================================================================== RCS file: /cvsroot/jrman/drafts/sampleData/headus.com-killeroo.rib,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** headus.com-killeroo.rib 17 Feb 2007 03:07:57 -0000 1.6 --- headus.com-killeroo.rib 17 Feb 2007 03:50:26 -0000 1.7 *************** *** 110,114 **** --- 110,120 ---- WorldBegin #ShadingRate .25 + Color 0 0 .7 + Sphere 10000 -10000 10000 360 + TransformBegin + Translate -400 -100 0 + Rotate -90 0 0 1 ReadArchive "killeroo-data.rib" + TransformEnd TransformBegin Translate -200 -200 -149 |
|
From: Elmer G. <ega...@us...> - 2007-02-17 03:08:10
|
Update of /cvsroot/jrman/drafts/sampleData In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv12285/sampleData Modified Files: headus.com-killeroo.rib Added Files: grass-data.rib killeroo-data.rib Log Message: Added new sample file --- NEW FILE: killeroo-data.rib --- AttributeBegin Declare "mapname" "string" Declare "min_u" "float" Declare "max_u" "float" Declare "min_v" "float" Declare "max_v" "float" Declare "thickness" "float" Declare "Km" "float" Declare "grid_color" "color" Surface "matte" "Ka" 0 "Kd" 1 Color .5 .25 .25 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 -8.4936 124.834 14.9662 1 -8.527 125.045 14.255 1 -8.9526 124.217 17.189 1 -8.9306 124.314 16.4943 1 -8.7317 124.277 15.5255 1 -8.6483 124.52 14.8459 1 -8.6787 124.749 14.1082 1 -9.2466 124.064 17.182 1 -9.1856 124.03 16.4822 1 [...6299 lines suppressed...] -23.9866 41.6397 -134.614 1 -23.6071 42.7914 -135.604 1 -23.2906 42.9631 -136.367 1 -26.1215 35.8125 -135.549 1 -25.6992 36.6379 -135.314 1 -25.275 37.5106 -135.333 1 -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 Index: headus.com-killeroo.rib =================================================================== RCS file: /cvsroot/jrman/drafts/sampleData/headus.com-killeroo.rib,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** headus.com-killeroo.rib 6 Dec 2006 17:17:09 -0000 1.5 --- headus.com-killeroo.rib 17 Feb 2007 03:07:57 -0000 1.6 *************** *** 100,6453 **** #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 [...6346 lines suppressed...] Format 796 515 1 ! Projection "perspective" "fov" [ 17 ] ! LightSource "distantlight" 1 "intensity" 0.8 "from" [0 1 0] "to" [0 0 0] ! LightSource "ambientlight" 2 "intensity" 0.2 ! Rotate 5 0 1 0 ! Translate 0 10 1000 ! Rotate -10 1 0 0 ! Rotate 50 0 1 0 ! Rotate -90 1 0 0 WorldBegin ! #ShadingRate .25 ! ReadArchive "killeroo-data.rib" ! TransformBegin ! Translate -200 -200 -149 ! Rotate 90 1 0 0 ! Scale 10 10 10 ! ReadArchive "grass-data.rib" ! TransformEnd WorldEnd FrameEnd --- NEW FILE: grass-data.rib --- AttributeBegin Surface "matte" "Ka" 0 "Kd" 1 Color .3 .2 0 Patch "bilinear" "P" [-50.000000 0.000000 -50.000000 50.000000 0.000000 -50.000000 -50.000000 0.000000 50.000000 50.000000 0.000000 50.000000] AttributeEnd AttributeBegin Surface "matte" "Ka" 0 "Kd" 1 Color 0 .6 0 Curves "cubic" [4] "nonperiodic" "P" [-49.773075 0.000000 -49.764263 -49.773075 1.116622 -49.764263 -50.170143 2.233244 -49.715927 -50.567211 3.349866 -49.667591] "N" [0.992672 0.000000 -0.120839 0.992672 0.200000 -0.120839] "width" [.2 0] Curves "cubic" [4] "nonperiodic" "P" [-49.528240 0.000000 -49.007858 -49.528240 1.596628 -49.007858 -49.397141 3.193256 -49.385765 -49.266041 4.789884 -49.763672] "N" [-0.327748 0.000000 0.944765 -0.327748 0.200000 0.944765] "width" [.2 0] Curves "cubic" [4] "nonperiodic" "P" [-49.931049 0.000000 -48.598522 -49.931049 1.327499 -48.598522 -49.541790 2.654998 -48.690598 -49.152531 3.982497 -48.782673] "N" [-0.973146 0.000000 0.230188 -0.973146 0.200000 0.230188] "width" [.2 0] Curves "cubic" [4] "nonperiodic" "P" [-49.860931 0.000000 -48.166172 -49.860931 1.425610 -48.166172 -50.260464 2.851220 -48.185501 -50.659996 4.276830 -48.204830] "N" [0.998832 0.000000 0.048325 0.998832 0.200000 0.048325] [...119970 lines suppressed...] "width" [.2 0] Curves "cubic" [4] "nonperiodic" "P" [49.660698 0.000000 47.468662 49.660698 1.551281 47.468662 49.614300 3.102562 47.071362 49.567902 4.653842 46.674061] "N" [0.115996 0.000000 0.993250 0.115996 0.200000 0.993250] "width" [.2 0] Curves "cubic" [4] "nonperiodic" "P" [49.982906 0.000000 47.545635 49.982906 1.528743 47.545635 49.591084 3.057486 47.465172 49.199257 4.586229 47.384712] "N" [0.979560 0.000000 0.201154 0.979560 0.200000 0.201154] "width" [.2 0] Curves "cubic" [4] "nonperiodic" "P" [49.893005 0.000000 48.192844 49.893005 1.557249 48.192844 49.495644 3.114498 48.146976 49.098282 4.671747 48.101105] "N" [0.993403 0.000000 0.114673 0.993403 0.200000 0.114673] "width" [.2 0] Curves "cubic" [4] "nonperiodic" "P" [49.803558 0.000000 48.558266 49.803558 1.195073 48.558266 49.645580 2.390146 48.925747 49.487602 3.585220 49.293232] "N" [0.394943 0.000000 -0.918706 0.394943 0.200000 -0.918706] "width" [.2 0] Curves "cubic" [4] "nonperiodic" "P" [49.823891 0.000000 49.276173 49.823891 1.592294 49.276173 49.585972 3.184588 49.597721 49.348053 4.776882 49.919273] "N" [0.594799 0.000000 -0.803875 0.594799 0.200000 -0.803875] "width" [.2 0] Curves "cubic" [4] "nonperiodic" "P" [49.678322 0.000000 49.779922 49.678322 1.400560 49.779922 49.473347 2.801120 49.436432 49.268372 4.201679 49.092945] "N" [0.512440 0.000000 0.858723 0.512440 0.200000 0.858723] "width" [.2 0] AttributeEnd |
|
From: Gerardo H. <ma...@us...> - 2007-02-04 07:45:46
|
Update of /cvsroot/jrman/drafts/src In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv3831/src Modified Files: SurfaceHair.java Log Message: Returned to previous implementation of hair shader (must fix this!). Index: SurfaceHair.java =================================================================== RCS file: /cvsroot/jrman/drafts/src/SurfaceHair.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SurfaceHair.java 30 Dec 2006 13:49:21 -0000 1.3 --- SurfaceHair.java 4 Feb 2007 07:45:40 -0000 1.4 *************** *** 164,174 **** _fg1.max(_fg1, 0.001f); _fg1.simulPow(_fg1, 1f / roughness); ! _fg1.mul(_fg1, sv.v); _cg1.set(_fg1); _cg1.mul(sv.Cl, _cg1); Cspec.add(Cspec, _cg1); ! _cg1.set(sv.v); ! _cg1.mul(sv.Cl, _cg1); ! Cdiff.add(Cdiff, _cg1); } } --- 164,174 ---- _fg1.max(_fg1, 0.001f); _fg1.simulPow(_fg1, 1f / roughness); ! //_fg1.mul(_fg1, sv.v); _cg1.set(_fg1); _cg1.mul(sv.Cl, _cg1); Cspec.add(Cspec, _cg1); ! //_cg1.set(sv.v); ! //_cg1.mul(sv.Cl, _cg1); ! // Cdiff.add(Cdiff, _cg1); } } |
|
From: Gerardo H. <ma...@us...> - 2007-02-04 06:31:02
|
Update of /cvsroot/jrman/drafts In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv4427 Removed Files: jrman-0_4.tar.gz Log Message: Removed binary file added accidentally to CVS by braindamaged IDE. --- jrman-0_4.tar.gz DELETED --- |
|
From: Gerardo H. <ma...@us...> - 2007-02-04 06:27:16
|
Update of /cvsroot/jrman/drafts/src/org/jrman/parameters In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv2065/src/org/jrman/parameters Modified Files: VaryingScalarHPoint.java Log Message: Fixed bug in implementation of rational cubic curves (didn't handle Pw parameter at the curve level). Index: VaryingScalarHPoint.java =================================================================== RCS file: /cvsroot/jrman/drafts/src/org/jrman/parameters/VaryingScalarHPoint.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** VaryingScalarHPoint.java 24 Dec 2006 05:25:56 -0000 1.9 --- VaryingScalarHPoint.java 4 Feb 2007 06:27:13 -0000 1.10 *************** *** 60,63 **** --- 60,67 ---- } + public int getCount() { + return values.length / 4; + } + public Parameter linearInterpolate(float min, float max) { float[] newValues = new float[8]; |
|
From: Gerardo H. <ma...@us...> - 2007-02-04 06:27:16
|
Update of /cvsroot/jrman/drafts/src/org/jrman/primitive In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv2065/src/org/jrman/primitive Modified Files: CubicCurve.java Log Message: Fixed bug in implementation of rational cubic curves (didn't handle Pw parameter at the curve level). Index: CubicCurve.java =================================================================== RCS file: /cvsroot/jrman/drafts/src/org/jrman/primitive/CubicCurve.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** CubicCurve.java 30 Dec 2006 16:32:23 -0000 1.6 --- CubicCurve.java 4 Feb 2007 06:27:13 -0000 1.7 *************** *** 45,49 **** public class CubicCurve extends Primitive { ! static Point3f tmpPoint = new Point3f(); boolean periodic; --- 45,53 ---- public class CubicCurve extends Primitive { ! private final static Declaration DECL_PW = new Declaration("Pw", ! Declaration.StorageClass.VERTEX, ! Declaration.Type.HPOINT, 1); ! ! static Point4f tmpPoint = new Point4f(); boolean periodic; *************** *** 54,57 **** --- 58,70 ---- this.periodic = periodic; this.parameters = parameters; + VaryingScalarTuple3f param3f = + (VaryingScalarTuple3f) parameters.getParameter("P"); + + if (param3f != null) { + parameters.removeParameter("P"); + parameters.addParameter( + new VaryingScalarHPoint(DECL_PW, param3f)); + } + VaryingScalarFloat widthParam = (VaryingScalarFloat) parameters.getParameter("width"); *************** *** 73,78 **** Parameter param = parameters.getParameter("v"); if (param == null && !periodic) { ! VaryingScalarTuple3f points = ! (VaryingScalarTuple3f) parameters.getParameter("P"); int n = (points.getCount() - 4) / attributes.getVStep() + 2; float[] values = new float[n]; --- 86,91 ---- Parameter param = parameters.getParameter("v"); if (param == null && !periodic) { ! VaryingScalarHPoint points = ! (VaryingScalarHPoint) parameters.getParameter("Pw"); int n = (points.getCount() - 4) / attributes.getVStep() + 2; float[] values = new float[n]; *************** *** 91,100 **** public BoundingVolume getBoundingVolume() { ! VaryingScalarTuple3f points = ! (VaryingScalarTuple3f) parameters.getParameter("P"); ConvexHull3f ch = new ConvexHull3f(); for (int i = 0, n = points.getCount(); i < n; i++) { points.getValue(i, tmpPoint); ! ch.addPoint(tmpPoint); } return ch; --- 104,113 ---- public BoundingVolume getBoundingVolume() { ! VaryingScalarHPoint points = ! (VaryingScalarHPoint) parameters.getParameter("Pw"); ConvexHull3f ch = new ConvexHull3f(); for (int i = 0, n = points.getCount(); i < n; i++) { points.getValue(i, tmpPoint); ! ch.addHpoint(tmpPoint); } return ch; *************** *** 102,107 **** public Primitive[] split() { ! VaryingScalarTuple3f points = ! (VaryingScalarTuple3f) parameters.getParameter("P"); int n = points.getCount(); int vStep = attributes.getVStep(); --- 115,120 ---- public Primitive[] split() { ! VaryingScalarHPoint points = ! (VaryingScalarHPoint) parameters.getParameter("Pw"); int n = points.getCount(); int vStep = attributes.getVStep(); *************** *** 144,152 **** private static class CubicSegment extends Primitive { - final static Declaration DECL_PW = - new Declaration("Pw", - Declaration.StorageClass.VERTEX, - Declaration.Type.HPOINT, 1); - static Point4f pa = new Point4f(); --- 157,160 ---- *************** *** 211,221 **** private void extractPoints() { - VaryingScalarTuple3f param3f = - (VaryingScalarTuple3f) parameters.getParameter("P"); - if (param3f != null) { - parameters.removeParameter("P"); - parameters.addParameter( - new VaryingScalarHPoint(DECL_PW, param3f)); - } VaryingScalarHPoint paramHp = (VaryingScalarHPoint) parameters.getParameter("Pw"); --- 219,222 ---- |
|
From: Gerardo H. <ma...@us...> - 2007-02-04 06:27:16
|
Update of /cvsroot/jrman/drafts In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv2065 Added Files: jrman-0_4.tar.gz Log Message: Fixed bug in implementation of rational cubic curves (didn't handle Pw parameter at the curve level). --- NEW FILE: jrman-0_4.tar.gz --- (This appears to be a binary file; contents omitted.) |
|
From: Gerardo H. <ma...@us...> - 2007-02-04 06:02:31
|
Update of /cvsroot/jrman/drafts In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv23935 Modified Files: build.xml Log Message: Changed heap size for running and profiling in build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jrman/drafts/build.xml,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** build.xml 2 Feb 2007 00:19:42 -0000 1.22 --- build.xml 4 Feb 2007 06:02:26 -0000 1.23 *************** *** 49,54 **** </classpath> <jvmarg value="-server"/> ! <jvmarg value="-Xms512m"/> ! <jvmarg value="-Xmx512m"/> </java> </target> --- 49,54 ---- </classpath> <jvmarg value="-server"/> ! <jvmarg value="-Xms256m"/> ! <jvmarg value="-Xmx256m"/> </java> </target> *************** *** 75,80 **** <jvmarg value="${profiler.info.jvmargs.agent}"/> <jvmarg value="-server"/> ! <jvmarg value="-Xms640m"/> ! <jvmarg value="-Xmx640m"/> </java> </target> --- 75,80 ---- <jvmarg value="${profiler.info.jvmargs.agent}"/> <jvmarg value="-server"/> ! <jvmarg value="-Xms256m"/> ! <jvmarg value="-Xmx256m"/> </java> </target> |
|
From: Gerardo H. <ma...@us...> - 2007-02-02 00:19:47
|
Update of /cvsroot/jrman/drafts In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv2711 Modified Files: build.xml Log Message: Modified build.xml to make it more NetBeans friendly: compiled class go to 'classes' directory instead of 'build' directory so NetBeans doesn't keep trying to add them to the CVS repository. By the way, the previous commit was about having a smaller RAM footprint when rendering high-resolution images, by: 1. "lazy" bucket creation 2. discarding buckets which have already been rendered Index: build.xml =================================================================== RCS file: /cvsroot/jrman/drafts/build.xml,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** build.xml 1 Feb 2007 20:30:15 -0000 1.21 --- build.xml 2 Feb 2007 00:19:42 -0000 1.22 *************** *** 4,8 **** <property name="src" location="src"/> <property name="lib" location="lib"/> ! <property name="build" location="build"/> <property name="jrman" location="jrMan"/> <property name="models" location="sampleData"/> --- 4,8 ---- <property name="src" location="src"/> <property name="lib" location="lib"/> ! <property name="build" location="classes"/> <property name="jrman" location="jrMan"/> <property name="models" location="sampleData"/> *************** *** 42,47 **** <java dir="sampleData" classname="org.jrman.main.JrManGUI" fork="true"> <classpath> ! <path path="build"/> ! <path path="src"/> <fileset dir="lib"> <include name="**/*.jar"/> --- 42,47 ---- <java dir="sampleData" classname="org.jrman.main.JrManGUI" fork="true"> <classpath> ! <path path="${build}"/> ! <path path="${src}"/> <fileset dir="lib"> <include name="**/*.jar"/> *************** *** 58,63 **** <nbprofiledirect> <classpath> ! <path path="build"/> ! <path path="src"/> <fileset dir="lib"> <include name="**/*.jar"/> --- 58,63 ---- <nbprofiledirect> <classpath> ! <path path="${build}"/> ! <path path="${src}"/> <fileset dir="lib"> <include name="**/*.jar"/> *************** *** 67,72 **** <java dir="sampleData" classname="org.jrman.main.JrManGUI" fork="true"> <classpath> ! <path path="build"/> ! <path path="src"/> <fileset dir="lib"> <include name="**/*.jar"/> --- 67,72 ---- <java dir="sampleData" classname="org.jrman.main.JrManGUI" fork="true"> <classpath> ! <path path="${build}"/> ! <path path="${src}"/> <fileset dir="lib"> <include name="**/*.jar"/> *************** *** 89,93 **** <jar jarfile="${dist}/jar/jrman.jar" basedir="${build}"> ! <fileset dir="src"> <exclude name="*.java"/> <include name="net/**"/> --- 89,93 ---- <jar jarfile="${dist}/jar/jrman.jar" basedir="${build}"> ! <fileset dir="${src}"> <exclude name="*.java"/> <include name="net/**"/> |
|
From: Gerardo H. <ma...@us...> - 2007-02-01 20:30:22
|
Update of /cvsroot/jrman/drafts/src/org/jrman/render In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv6599/src/org/jrman/render Modified Files: Bucket.java RendererHidden.java MemoryBucket.java Log Message: no message Index: RendererHidden.java =================================================================== RCS file: /cvsroot/jrman/drafts/src/org/jrman/render/RendererHidden.java,v retrieving revision 1.76 retrieving revision 1.77 diff -C2 -d -r1.76 -r1.77 *** RendererHidden.java 30 Jan 2007 05:09:32 -0000 1.76 --- RendererHidden.java 1 Feb 2007 20:30:14 -0000 1.77 *************** *** 280,284 **** private Bucket getBucket(int column, int row) { ! return buckets[row * bucketColumns + column]; } --- 280,291 ---- private Bucket getBucket(int column, int row) { ! int idx = row * bucketColumns + column; ! if (buckets[idx] == null) ! buckets[idx] = new MemoryBucket(); ! return buckets[idx]; ! } ! ! private void discardBucket(int column, int row) { ! buckets[row * bucketColumns + column] = null; } *************** *** 394,398 **** if (bucket.hasMoreMicropolygons()) sampler.sampleBucket(bucket); ! bucket.flush(); if (displayMode == Display.Mode.RGB || displayMode == Display.Mode.RGBA) { sampler.getColors( --- 401,405 ---- if (bucket.hasMoreMicropolygons()) sampler.sampleBucket(bucket); ! discardBucket(column, row); if (displayMode == Display.Mode.RGB || displayMode == Display.Mode.RGBA) { sampler.getColors( *************** *** 508,515 **** System.err.println("Error writing image file: " + e); } - for (int i = 0; i < buckets.length; i++) { - if (buckets[i].hasMorePrimitives()) - System.out.println("More primitives: " + i); - } long end = System.currentTimeMillis(); float time = (end - start) / 1000f; --- 515,518 ---- *************** *** 697,702 **** else hExtra = 0; - for (int i = 0; i < buckets.length; i++) - buckets[i] = new MemoryBucket(); } --- 700,703 ---- Index: Bucket.java =================================================================== RCS file: /cvsroot/jrman/drafts/src/org/jrman/render/Bucket.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Bucket.java 20 Sep 2004 21:09:06 -0000 1.11 --- Bucket.java 1 Feb 2007 20:30:14 -0000 1.12 *************** *** 36,41 **** Micropolygon getNextMicropolygon(); - void flush(); - void sortPrimitives(); --- 36,39 ---- Index: MemoryBucket.java =================================================================== RCS file: /cvsroot/jrman/drafts/src/org/jrman/render/MemoryBucket.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** MemoryBucket.java 6 Jul 2005 22:53:23 -0000 1.10 --- MemoryBucket.java 1 Feb 2007 20:30:14 -0000 1.11 *************** *** 49,53 **** tmp = new Primitive[50]; else ! tmp = new Primitive[primitiveCount * 4]; System.arraycopy(primitives, 0, tmp, 0, primitiveCount); primitives = tmp; --- 49,53 ---- tmp = new Primitive[50]; else ! tmp = new Primitive[primitiveCount * 2]; System.arraycopy(primitives, 0, tmp, 0, primitiveCount); primitives = tmp; *************** *** 89,93 **** tmp = new Micropolygon[1024]; else ! tmp = new Micropolygon[micropolygonCount * 4]; System.arraycopy(micropolygons, 0, tmp, 0, micropolygonCount); micropolygons = tmp; --- 89,93 ---- tmp = new Micropolygon[1024]; else ! tmp = new Micropolygon[micropolygonCount * 2]; System.arraycopy(micropolygons, 0, tmp, 0, micropolygonCount); micropolygons = tmp; *************** *** 107,120 **** } - public void flush() { - flushed = true; - for (int i = 0; i < primitiveCount; i++) - primitives[i] = null; - primitiveCount = 0; - for (int i = 0; i < micropolygonCount; i++) - micropolygons[i] = null; - micropolygons = null; - micropolygonCount = 0; - } - } --- 107,109 ---- |
|
From: Gerardo H. <ma...@us...> - 2007-02-01 20:30:22
|
Update of /cvsroot/jrman/drafts In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv6599 Modified Files: build.xml Log Message: no message Index: build.xml =================================================================== RCS file: /cvsroot/jrman/drafts/build.xml,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** build.xml 1 Feb 2007 18:52:00 -0000 1.20 --- build.xml 1 Feb 2007 20:30:15 -0000 1.21 *************** *** 75,80 **** <jvmarg value="${profiler.info.jvmargs.agent}"/> <jvmarg value="-server"/> ! <jvmarg value="-Xms512m"/> ! <jvmarg value="-Xmx512m"/> </java> </target> --- 75,80 ---- <jvmarg value="${profiler.info.jvmargs.agent}"/> <jvmarg value="-server"/> ! <jvmarg value="-Xms640m"/> ! <jvmarg value="-Xmx640m"/> </java> </target> |
|
From: Gerardo H. <ma...@us...> - 2007-02-01 18:52:14
|
Update of /cvsroot/jrman/drafts In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv27862 Modified Files: build.xml Log Message: Added Ant task for NetBeans Profiler. Index: build.xml =================================================================== RCS file: /cvsroot/jrman/drafts/build.xml,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** build.xml 30 Jan 2007 05:09:32 -0000 1.19 --- build.xml 1 Feb 2007 18:52:00 -0000 1.20 *************** *** 54,57 **** --- 54,83 ---- </target> + <target name="profile" depends="compile" description="Profile Project"> + <fail unless="netbeans.home">This target can only be run inside the NetBeans IDE.</fail> + <nbprofiledirect> + <classpath> + <path path="build"/> + <path path="src"/> + <fileset dir="lib"> + <include name="**/*.jar"/> + </fileset> + </classpath> + </nbprofiledirect> + <java dir="sampleData" classname="org.jrman.main.JrManGUI" fork="true"> + <classpath> + <path path="build"/> + <path path="src"/> + <fileset dir="lib"> + <include name="**/*.jar"/> + </fileset> + </classpath> + <jvmarg value="${profiler.info.jvmargs.agent}"/> + <jvmarg value="-server"/> + <jvmarg value="-Xms512m"/> + <jvmarg value="-Xmx512m"/> + </java> + </target> + <target name="dist" depends="compile" description="generate the distribution" > |
|
From: Gerardo H. <ma...@us...> - 2007-01-30 05:09:36
|
Update of /cvsroot/jrman/drafts/src/org/jrman/render In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv20042/src/org/jrman/render Modified Files: RendererHidden.java Log Message: First test as a NetBeans project. Index: RendererHidden.java =================================================================== RCS file: /cvsroot/jrman/drafts/src/org/jrman/render/RendererHidden.java,v retrieving revision 1.75 retrieving revision 1.76 diff -C2 -d -r1.75 -r1.76 *** RendererHidden.java 24 Dec 2006 05:25:57 -0000 1.75 --- RendererHidden.java 30 Jan 2007 05:09:32 -0000 1.76 *************** *** 1,15 **** /* * RendererHidden.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 --- 1,15 ---- /* * RendererHidden.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 *************** *** 55,111 **** public class RendererHidden extends Renderer { ! private final static int MAX_EYE_SPLITS = 20; ! private final static Vector3f ORTHO_I = new Vector3f(0f, 0f, 1f); ! private ClippingVolume clippingVolume; ! private Plane eyePlane; ! private Transform worldToCamera; ! private Transform cameraToRaster; ! private Bounds2f rasterWindow; ! private Point2f rasterWindowMin; ! private Bucket[] buckets; ! private int bucketColumns; ! private int bucketRows; ! private int bucketWidth; ! private int bucketHeight; ! private int primitivePatchCount; ! private int invisiblePatchCount; private int clippedPrimitivesCount; ! private long worldParseStart; ! private long worldParseEnd; ! private int hFilterExtra; ! private int vFilterExtra; ! private int hPixelLess; ! private int vPixelLess; ! private SamplesFilter samplesFilter; ! private int hExtra; ! private int wExtra; ! private Transform oldObjectToWorld; ! private Transform oldObjectToCamera; --- 55,111 ---- public class RendererHidden extends Renderer { ! private final static int MAX_EYE_SPLITS = 20; ! private final static Vector3f ORTHO_I = new Vector3f(0f, 0f, 1f); ! private ClippingVolume clippingVolume; ! private Plane eyePlane; ! private Transform worldToCamera; ! private Transform cameraToRaster; ! private Bounds2f rasterWindow; ! private Point2f rasterWindowMin; ! private Bucket[] buckets; ! private int bucketColumns; ! private int bucketRows; ! private int bucketWidth; ! private int bucketHeight; ! private int primitivePatchCount; ! private int invisiblePatchCount; private int clippedPrimitivesCount; ! private long worldParseStart; ! private long worldParseEnd; ! private int hFilterExtra; ! private int vFilterExtra; ! private int hPixelLess; ! private int vPixelLess; ! private SamplesFilter samplesFilter; ! private int hExtra; ! private int wExtra; ! private Transform oldObjectToWorld; ! private Transform oldObjectToCamera; *************** *** 115,121 **** private boolean rendering; ! private Point3fGrid pointsTmp; ! public void init(Frame frame, World world, Parser parser) { super.init(frame, world, parser); --- 115,121 ---- private boolean rendering; ! private Point3fGrid pointsTmp; ! public void init(Frame frame, World world, Parser parser) { super.init(frame, world, parser); *************** *** 134,147 **** worldParseStart = System.currentTimeMillis(); } ! public void addPrimitive(Primitive primitive) { internalAddPrimitive(primitive, column, row, rendering); } ! private void internalAddPrimitive( ! Primitive primitive, ! int curColumn, ! int curRow, ! boolean check) { Transform objectToCamera = primitive.getObjectToCamera(); if (objectToCamera == null) { --- 134,147 ---- worldParseStart = System.currentTimeMillis(); } ! public void addPrimitive(Primitive primitive) { internalAddPrimitive(primitive, column, row, rendering); } ! private void internalAddPrimitive( ! Primitive primitive, ! int curColumn, ! int curRow, ! boolean check) { Transform objectToCamera = primitive.getObjectToCamera(); if (objectToCamera == null) { *************** *** 159,170 **** System.err.println("Can't split primitive at eye plane: " + primitive); } ! private boolean addPrimitive( ! Primitive primitive, ! int recursionLevel, ! Transform objectToCamera, ! int curColumn, ! int curRow, ! boolean check) { BoundingVolume bv = primitive.getBoundingVolume(); float db = primitive.getAttributes().getDisplacementBound(); --- 159,170 ---- System.err.println("Can't split primitive at eye plane: " + primitive); } ! private boolean addPrimitive( ! Primitive primitive, ! int recursionLevel, ! Transform objectToCamera, ! int curColumn, ! int curRow, ! boolean check) { BoundingVolume bv = primitive.getBoundingVolume(); float db = primitive.getAttributes().getDisplacementBound(); *************** *** 202,213 **** return result; } ! private void placeInBucket( ! Primitive primitive, ! BoundingVolume bve, ! BoundingVolume bv, ! int column, ! int row, ! boolean check) { primitive.setDistance(bve.getMinZ()); bve = bve.transform(cameraToRaster); --- 202,213 ---- return result; } ! private void placeInBucket( ! Primitive primitive, ! BoundingVolume bve, ! BoundingVolume bv, ! int column, ! int row, ! boolean check) { primitive.setDistance(bve.getMinZ()); bve = bve.transform(cameraToRaster); *************** *** 225,234 **** doPlaceInBucket(primitive, column, row, check); } ! private void doPlaceInBucket( ! Primitive primitive, ! int curColumn, ! int curRow, ! boolean check) { Bounds2f bounds = primitive.getRasterBounds(); if (!bounds.intersects(rasterWindow)) --- 225,234 ---- doPlaceInBucket(primitive, column, row, check); } ! private void doPlaceInBucket( ! Primitive primitive, ! int curColumn, ! int curRow, ! boolean check) { Bounds2f bounds = primitive.getRasterBounds(); if (!bounds.intersects(rasterWindow)) *************** *** 246,250 **** float maxX = bounds.getMaxX() - rasterWindow.getMinX(); int maxColumn = ! Calc.clamp((int) Math.ceil(maxX / bucketWidth), 0, bucketColumns - 1); if (column <= curColumn && curColumn <= maxColumn) { getBucket(curColumn, curRow).addPrimitive(primitive); --- 246,250 ---- float maxX = bounds.getMaxX() - rasterWindow.getMinX(); int maxColumn = ! Calc.clamp((int) Math.ceil(maxX / bucketWidth), 0, bucketColumns - 1); if (column <= curColumn && curColumn <= maxColumn) { getBucket(curColumn, curRow).addPrimitive(primitive); *************** *** 261,265 **** getBucket(column, row).addPrimitive(primitive); } ! public void addToBuckets(Micropolygon mp) { if (mp.getMaxX() < rasterWindowMin.x || mp.getMaxY() < rasterWindowMin.y) --- 261,265 ---- getBucket(column, row).addPrimitive(primitive); } ! public void addToBuckets(Micropolygon mp) { if (mp.getMaxX() < rasterWindowMin.x || mp.getMaxY() < rasterWindowMin.y) *************** *** 278,286 **** getBucket(col, row).addMicropolygon(mp); } ! private Bucket getBucket(int column, int row) { return buckets[row * bucketColumns + column]; } ! public void render() { rendering = true; --- 278,286 ---- getBucket(col, row).addMicropolygon(mp); } ! private Bucket getBucket(int column, int row) { return buckets[row * bucketColumns + column]; } ! public void render() { rendering = true; *************** *** 289,293 **** Display.Type displayType = frame.getDisplay().getType(); ImageStore imageStore = ! new ImageStore( frame.getHorizontalResolution(), frame.getVerticalResolution(), --- 289,293 ---- Display.Type displayType = frame.getDisplay().getType(); ImageStore imageStore = ! new ImageStore( frame.getHorizontalResolution(), frame.getVerticalResolution(), *************** *** 296,300 **** if (displayMode == Display.Mode.Z) { zStore = ! new ZStore(frame.getHorizontalResolution(), frame.getVerticalResolution()); ShadowMap.flushShadowMap(frame.getDisplay().getName()); } --- 296,300 ---- if (displayMode == Display.Mode.Z) { zStore = ! new ZStore(frame.getHorizontalResolution(), frame.getVerticalResolution()); ShadowMap.flushShadowMap(frame.getDisplay().getName()); } *************** *** 304,313 **** fb.setVisible(true); } ! int gridSize = frame.getGridSize(); ShaderVariables shaderVariables = new ShaderVariables(worldToCamera.getInverse()); int gridCount = 0; Sampler sampler = ! new Sampler( bucketWidth, bucketHeight, --- 304,313 ---- fb.setVisible(true); } ! int gridSize = frame.getGridSize(); ShaderVariables shaderVariables = new ShaderVariables(worldToCamera.getInverse()); int gridCount = 0; Sampler sampler = ! new Sampler( bucketWidth, bucketHeight, *************** *** 316,325 **** Filter filter = frame.getFilter(); samplesFilter.init( ! (int) Math.ceil(filter.getHorizontalWidth() * sampler.getPixelWidth()), ! (int) Math.ceil(filter.getVerticalWidth() * sampler.getPixelHeight()), ! filter.getHorizontalWidth(), ! filter.getVerticalWidth()); float[] samples = ! new float[sampler.getWidth() * bucketColumns * (sampler.getHeight() + vFilterExtra + vPixelLess * sampler.getPixelHeight()) --- 316,325 ---- Filter filter = frame.getFilter(); samplesFilter.init( ! (int) Math.ceil(filter.getHorizontalWidth() * sampler.getPixelWidth()), ! (int) Math.ceil(filter.getVerticalWidth() * sampler.getPixelHeight()), ! filter.getHorizontalWidth(), ! filter.getVerticalWidth()); float[] samples = ! new float[sampler.getWidth() * bucketColumns * (sampler.getHeight() + vFilterExtra + vPixelLess * sampler.getPixelHeight()) *************** *** 363,367 **** if (surface == null) surface = ! SurfaceShader.createShader( "fakedlight", new ParameterList(), --- 363,367 ---- if (surface == null) surface = ! SurfaceShader.createShader( "fakedlight", new ParameterList(), *************** *** 371,377 **** if (vs != null) vs.shade( ! shaderVariables, ! frame.getNearClipping(), ! frame.getFarClipping()); shaderVariables.transform(cameraToRaster); shaderVariables.getMicropolygons(this); --- 371,377 ---- if (vs != null) vs.shade( ! shaderVariables, ! frame.getNearClipping(), ! frame.getFarClipping()); shaderVariables.transform(cameraToRaster); shaderVariables.getMicropolygons(this); *************** *** 397,455 **** if (displayMode == Display.Mode.RGB || displayMode == Display.Mode.RGBA) { sampler.getColors( ! samples, ! (column * sampler.getWidth() + (row == 0 ? 0 : 1) ! * (vFilterExtra + vPixelLess * sampler.getPixelHeight()) ! * bucketColumns ! * sampler.getWidth()) * 4, ! bucketColumns * sampler.getWidth(), ! 4, ! 0); samplesFilter.doFilter( ! samples, ! (column * sampler.getWidth() - (column == 0 ! ? 0 ! : (hFilterExtra + hPixelLess * sampler.getPixelWidth()))) * 4, ! bucketColumns * sampler.getWidth(), ! filteredSamples, ! 0, ! bucketWidth, ! bucketWidth - (column == 0 ? hPixelLess : 0), ! bucketHeight - (row == 0 ? vPixelLess : 0), ! sampler.getPixelWidth(), ! sampler.getPixelHeight(), ! 4); colorsToPixels(filteredSamples, pixels); imageStore.setPixels( ! pixels, ! column * bucketWidth - (column == 0 ? 0 : hPixelLess) + (int) rmin.x, ! row * bucketHeight - (row == 0 ? 0 : vPixelLess) + (int) rmin.y, ! bucketWidth - (column == 0 ? hPixelLess : 0) - (column == bucketColumns - 1 ? wExtra : 0), ! bucketHeight - (row == 0 ? vPixelLess : 0) - (row == bucketRows - 1 ? hExtra : 0), ! bucketWidth); if (fb != null) fb.refresh( ! column * bucketWidth - (column == 0 ? 0 : hPixelLess) + (int) rmin.x, ! row * bucketHeight - (row == 0 ? 0 : vPixelLess) + (int) rmin.y, ! bucketWidth - (column == 0 ? hPixelLess : 0), ! bucketHeight - (row == 0 ? vPixelLess : 0)); } else if (displayMode == Display.Mode.Z) { sampler.getDepths(depths); zStore.setDepths( ! depths, ! column * bucketWidth + (int) rmin.x, ! row * bucketHeight + (int) rmin.y, ! bucketWidth, ! bucketHeight, ! bucketWidth); } if (frame.isShowProgressEnabled()) { --- 397,455 ---- if (displayMode == Display.Mode.RGB || displayMode == Display.Mode.RGBA) { sampler.getColors( ! samples, ! (column * sampler.getWidth() + (row == 0 ? 0 : 1) ! * (vFilterExtra + vPixelLess * sampler.getPixelHeight()) ! * bucketColumns ! * sampler.getWidth()) * 4, ! bucketColumns * sampler.getWidth(), ! 4, ! 0); samplesFilter.doFilter( ! samples, ! (column * sampler.getWidth() - (column == 0 ! ? 0 ! : (hFilterExtra + hPixelLess * sampler.getPixelWidth()))) * 4, ! bucketColumns * sampler.getWidth(), ! filteredSamples, ! 0, ! bucketWidth, ! bucketWidth - (column == 0 ? hPixelLess : 0), ! bucketHeight - (row == 0 ? vPixelLess : 0), ! sampler.getPixelWidth(), ! sampler.getPixelHeight(), ! 4); colorsToPixels(filteredSamples, pixels); imageStore.setPixels( ! pixels, ! column * bucketWidth - (column == 0 ? 0 : hPixelLess) + (int) rmin.x, ! row * bucketHeight - (row == 0 ? 0 : vPixelLess) + (int) rmin.y, ! bucketWidth - (column == 0 ? hPixelLess : 0) - (column == bucketColumns - 1 ? wExtra : 0), ! bucketHeight - (row == 0 ? vPixelLess : 0) - (row == bucketRows - 1 ? hExtra : 0), ! bucketWidth); if (fb != null) fb.refresh( ! column * bucketWidth - (column == 0 ? 0 : hPixelLess) + (int) rmin.x, ! row * bucketHeight - (row == 0 ? 0 : vPixelLess) + (int) rmin.y, ! bucketWidth - (column == 0 ? hPixelLess : 0), ! bucketHeight - (row == 0 ? vPixelLess : 0)); } else if (displayMode == Display.Mode.Z) { sampler.getDepths(depths); zStore.setDepths( ! depths, ! column * bucketWidth + (int) rmin.x, ! row * bucketHeight + (int) rmin.y, ! bucketWidth, ! bucketHeight, ! bucketWidth); } if (frame.isShowProgressEnabled()) { *************** *** 458,462 **** percentComplete = percent; System.out.print( ! "\r" + frame.getDisplay().getName() + " (frame " --- 458,462 ---- percentComplete = percent; System.out.print( ! "\r" + frame.getDisplay().getName() + " (frame " *************** *** 466,482 **** + "% complete"); } ! } } System.arraycopy( ! samples, ! (bucketHeight * sampler.getPixelHeight() - (row == 0 ? (vFilterExtra + vPixelLess * sampler.getPixelHeight()) : 0)) * bucketColumns * sampler.getWidth() * 4, ! samples, ! 0, ! (vFilterExtra + vPixelLess * sampler.getPixelHeight()) * bucketColumns * sampler.getWidth() --- 466,482 ---- + "% complete"); } ! } } System.arraycopy( ! samples, ! (bucketHeight * sampler.getPixelHeight() - (row == 0 ? (vFilterExtra + vPixelLess * sampler.getPixelHeight()) : 0)) * bucketColumns * sampler.getWidth() * 4, ! samples, ! 0, ! (vFilterExtra + vPixelLess * sampler.getPixelHeight()) * bucketColumns * sampler.getWidth() *************** *** 499,508 **** } else if (displayMode == Display.Mode.Z) ShadowMap.writeShadowMap( ! frame.getDisplay().getName(), ! worldToCamera, ! cameraToRaster, ! frame.getHorizontalResolution(), ! frame.getVerticalResolution(), ! zStore.getDepths()); } catch (Exception e) { System.err.println("Error writing image file: " + e); --- 499,508 ---- } else if (displayMode == Display.Mode.Z) ShadowMap.writeShadowMap( ! frame.getDisplay().getName(), ! worldToCamera, ! cameraToRaster, ! frame.getHorizontalResolution(), ! frame.getVerticalResolution(), ! zStore.getDepths()); } catch (Exception e) { System.err.println("Error writing image file: " + e); *************** *** 517,526 **** rendering = false; } ! private void displayStats(int gridCount, Sampler sampler, float time) { if (frame.endOfFrameStatisticsEnabled()) { System.out.println("*** Frame Statistics ***"); System.out.println( ! "World parse time: " + Format.time(worldParseEnd - worldParseStart)); display("spheres", parser.getSphereCount()); display("cylinders", parser.getCylinderCount()); --- 517,526 ---- rendering = false; } ! private void displayStats(int gridCount, Sampler sampler, float time) { if (frame.endOfFrameStatisticsEnabled()) { System.out.println("*** Frame Statistics ***"); System.out.println( ! "World parse time: " + Format.time(worldParseEnd - worldParseStart)); display("spheres", parser.getSphereCount()); display("cylinders", parser.getCylinderCount()); *************** *** 541,550 **** System.out.println("Invisible patches: " + invisiblePatchCount); System.out.println( ! "Patches culled: " + invisiblePatchCount * 100f / primitivePatchCount + "%"); System.out.println("Root count: " + sampler.getRootCount()); System.out.println("Pixel count: " + sampler.getPixelCount()); System.out.println("MP Root count: " + sampler.getMPRootCount()); System.out.println( ! "gridCount = " + gridCount + " in " --- 541,550 ---- System.out.println("Invisible patches: " + invisiblePatchCount); System.out.println( ! "Patches culled: " + invisiblePatchCount * 100f / primitivePatchCount + "%"); System.out.println("Root count: " + sampler.getRootCount()); System.out.println("Pixel count: " + sampler.getPixelCount()); System.out.println("MP Root count: " + sampler.getMPRootCount()); System.out.println( ! "gridCount = " + gridCount + " in " *************** *** 569,577 **** System.out.println("Total " + primitiveName + ": " + count); } ! private boolean isPrimitiveVisible(Primitive p, Sampler sampler) { return sampler.isVisible(p.getRasterBounds(), p.getDistance()); } ! private void placeInNextBucket(Primitive p, int column, int row) { if (column < bucketColumns - 1) --- 569,577 ---- System.out.println("Total " + primitiveName + ": " + count); } ! private boolean isPrimitiveVisible(Primitive p, Sampler sampler) { return sampler.isVisible(p.getRasterBounds(), p.getDistance()); } ! private void placeInNextBucket(Primitive p, int column, int row) { if (column < bucketColumns - 1) *************** *** 580,604 **** doPlaceInBucket(p, 0, row + 1, true); } ! private void colorsToPixels(float[] colors, int[] result) { Color3f tmp = new Color3f(); for (int row = 0; row < bucketHeight; row++) for (int col = 0; col < bucketWidth; col++) { ! int offset = (row * bucketWidth + col) * 4; ! tmp.x = colors[offset++]; ! tmp.y = colors[offset++]; ! tmp.z = colors[offset++]; ! float alphaFloat = colors[offset]; ! frame.getExposure().expose(tmp, tmp); ! Quantizer qt = frame.getColorQuantizer(); ! int red = qt.quantize(tmp.x); ! int green = qt.quantize(tmp.y); ! int blue = qt.quantize(tmp.z); ! int alpha = qt.quantize(alphaFloat); ! offset = row * bucketWidth + col; ! result[offset] = ((alpha << 24) | (red << 16) | (green << 8) | blue); } } ! private void createClippingVolume() { rasterWindow = createRasterWindow(); --- 580,604 ---- doPlaceInBucket(p, 0, row + 1, true); } ! private void colorsToPixels(float[] colors, int[] result) { Color3f tmp = new Color3f(); for (int row = 0; row < bucketHeight; row++) for (int col = 0; col < bucketWidth; col++) { ! int offset = (row * bucketWidth + col) * 4; ! tmp.x = colors[offset++]; ! tmp.y = colors[offset++]; ! tmp.z = colors[offset++]; ! float alphaFloat = colors[offset]; ! frame.getExposure().expose(tmp, tmp); ! Quantizer qt = frame.getColorQuantizer(); ! int red = qt.quantize(tmp.x); ! int green = qt.quantize(tmp.y); ! int blue = qt.quantize(tmp.z); ! int alpha = qt.quantize(alphaFloat); ! offset = row * bucketWidth + col; ! result[offset] = ((alpha << 24) | (red << 16) | (green << 8) | blue); } } ! private void createClippingVolume() { rasterWindow = createRasterWindow(); *************** *** 617,625 **** Point3f lowerRight = new Point3f(max.x, min.y, focalLength); clippingVolume.addPlane( ! Plane.createWithThreePoints(origin, upperLeft, upperRight)); clippingVolume.addPlane( ! Plane.createWithThreePoints(origin, upperRight, lowerRight)); clippingVolume.addPlane( ! Plane.createWithThreePoints(origin, lowerRight, lowerLeft)); clippingVolume.addPlane(Plane.createWithThreePoints(origin, lowerLeft, upperLeft)); } else { --- 617,625 ---- Point3f lowerRight = new Point3f(max.x, min.y, focalLength); clippingVolume.addPlane( ! Plane.createWithThreePoints(origin, upperLeft, upperRight)); clippingVolume.addPlane( ! Plane.createWithThreePoints(origin, upperRight, lowerRight)); clippingVolume.addPlane( ! Plane.createWithThreePoints(origin, lowerRight, lowerLeft)); clippingVolume.addPlane(Plane.createWithThreePoints(origin, lowerLeft, upperLeft)); } else { *************** *** 633,656 **** Point3f originLowerRight = new Point3f(max.x, min.y, 0f); clippingVolume.addPlane( ! Plane.createWithThreePoints(originUpperLeft, upperLeft, upperRight)); clippingVolume.addPlane( ! Plane.createWithThreePoints(originUpperRight, upperRight, lowerRight)); clippingVolume.addPlane( ! Plane.createWithThreePoints(originLowerRight, lowerRight, lowerLeft)); clippingVolume.addPlane( ! Plane.createWithThreePoints(originLowerLeft, lowerLeft, upperLeft)); } float near = frame.getNearClipping(); clippingVolume.addPlane( ! Plane.createWithPointAndNormal( new Point3f(0f, 0f, near), new Vector3f(0f, 0f, -1f))); float far = frame.getFarClipping(); clippingVolume.addPlane( ! Plane.createWithPointAndNormal( new Point3f(0f, 0f, far), new Vector3f(0f, 0f, 1f))); } ! private Bounds2f createRasterWindow() { Bounds2f cropWindow = frame.getCropWindow(); --- 633,656 ---- Point3f originLowerRight = new Point3f(max.x, min.y, 0f); clippingVolume.addPlane( ! Plane.createWithThreePoints(originUpperLeft, upperLeft, upperRight)); clippingVolume.addPlane( ! Plane.createWithThreePoints(originUpperRight, upperRight, lowerRight)); clippingVolume.addPlane( ! Plane.createWithThreePoints(originLowerRight, lowerRight, lowerLeft)); clippingVolume.addPlane( ! Plane.createWithThreePoints(originLowerLeft, lowerLeft, upperLeft)); } float near = frame.getNearClipping(); clippingVolume.addPlane( ! Plane.createWithPointAndNormal( new Point3f(0f, 0f, near), new Vector3f(0f, 0f, -1f))); float far = frame.getFarClipping(); clippingVolume.addPlane( ! Plane.createWithPointAndNormal( new Point3f(0f, 0f, far), new Vector3f(0f, 0f, 1f))); } ! private Bounds2f createRasterWindow() { Bounds2f cropWindow = frame.getCropWindow(); *************** *** 661,668 **** float rxmin = Calc.clamp((float) Math.ceil(xResolution * min.x), 0f, xResolution - 1); float rxmax = ! Calc.clamp((float) Math.ceil(xResolution * max.x - 1f), 0f, xResolution - 1); float rymin = Calc.clamp((float) Math.ceil(yResolution * min.y), 0f, yResolution - 1); float rymax = ! Calc.clamp((float) Math.ceil(yResolution * max.y - 1f), 0f, yResolution - 1); Filter filter = frame.getFilter(); float xw = (filter.getHorizontalWidth() - 1) / 2f; --- 661,668 ---- float rxmin = Calc.clamp((float) Math.ceil(xResolution * min.x), 0f, xResolution - 1); float rxmax = ! Calc.clamp((float) Math.ceil(xResolution * max.x - 1f), 0f, xResolution - 1); float rymin = Calc.clamp((float) Math.ceil(yResolution * min.y), 0f, yResolution - 1); float rymax = ! Calc.clamp((float) Math.ceil(yResolution * max.y - 1f), 0f, yResolution - 1); Filter filter = frame.getFilter(); float xw = (filter.getHorizontalWidth() - 1) / 2f; *************** *** 678,682 **** return new Bounds2f(rxmin, rxmax, rymin, rymax); } ! private void createBuckets() { Point2f min = rasterWindow.getMin(); --- 678,682 ---- return new Bounds2f(rxmin, rxmax, rymin, rymax); } ! private void createBuckets() { Point2f min = rasterWindow.getMin(); *************** *** 700,703 **** buckets[i] = new MemoryBucket(); } ! } --- 700,703 ---- buckets[i] = new MemoryBucket(); } ! } |
