[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11122] branches/soc-2007-joeedh/source/ blender/render/intern/source/zbuf.c: [Damn it! Tortoise SVN didn' t wrap the lines! ger.

[Joseph Eagar]

Revision: 11122
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11122
Author:   joeedh
Date:     2007-06-29 09:20:52 +0200 (Fri, 29 Jun 2007)

Log Message:
-----------
[Damn it! Tortoise SVN didn't wrap the lines! ger.
 I'm sure theres an option for it, I'll have to look
 it up]

Wahoo! DSM buffers actually work! Well, sortof.  The
 idiotic bug where DSM maps can only be initialized
 in the ztransp pass function is still there, so you
 have to a) have all the objects in your scene be
 ztransp with an alpha less then 1.0 (0.999 will
 do), and b) only render in one big tile, e.g. with
 x/yparts = 1.

Test renders:

With DSM:
http://img.photobucket.com/albums/v287/joeedh/deepstrandtest.png

Comparison with irregular:
http://img.photobucket.com/albums/v287/joeedh/deepstrandtest_irregular.png

Another DSM test:

http://img.photobucket.com/albums/v287/joeedh/deepstrandtest2.png

Compare with classical-halfway buffers:

http://img.photobucket.com/albums/v287/joeedh/deepstrandtest2classical-halfway.png

And compare with no shadows at all:

http://img.photobucket.com/albums/v287/joeedh/deepstrandtest2noshad.png

Also this commit includes some debugging
 modifications to guardedalloc.  Basically MEM_freeN
 is now a macro, to allow passing in file/line
 number info.  This way MEM_freeN can give traceback
 in error messages.

And, last but not least, I am not going to manually
 wrap the lines in this commit, instead I'm going to
 see what tortoisesvn does.  If it doesn't wrap
 them, I'll commit a dummy commit with the lines
 wrapped to play nice with reads and web archives
 and stuff.

Modified Paths:
--------------
    branches/soc-2007-joeedh/source/blender/render/intern/source/zbuf.c

Modified: branches/soc-2007-joeedh/source/blender/render/intern/source/zbuf.c
===================================================================
--- branches/soc-2007-joeedh/source/blender/render/intern/source/zbuf.c	2007-06-29 07:10:00 UTC (rev 11121)
+++ branches/soc-2007-joeedh/source/blender/render/intern/source/zbuf.c	2007-06-29 07:20:52 UTC (rev 11122)
@@ -2761,8 +2761,8 @@
 				dx = 0.0;
 				dy += 1.0;
 			}
-			zspan.zofsx= -pa->disprect.xmin - re->jit[zsample][0]*2; //FIXMEGREP: hardcoded blur factor of three // - dx //*15.0*((float)zsample/(float)R.osa);
-			zspan.zofsy= -pa->disprect.ymin - re->jit[zsample][1]*2; // - dy //*15.0*((float)zsample/(float)R.osa);
+			zspan.zofsx= -pa->disprect.xmin - dx*2; //sre->jit[zsample][0]*2; //FIXMEGREP: hardcoded blur factor of three // - dx //*15.0*((float)zsample/(float)R.osa);
+			zspan.zofsy= -pa->disprect.ymin - dy*2; //re->jit[zsample][1]*2; // - dy //*15.0*((float)zsample/(float)R.osa);
 			dx += 1.0;
 		}
 		else if(re->i.curblur) {