[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20871] branches/soc-2009-jaguarandi/ source/blender/render/intern/source: Enabled the missing features ( not tested)

[André Pinto]

Revision: 20871
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20871
Author:   jaguarandi
Date:     2009-06-14 12:56:29 +0200 (Sun, 14 Jun 2009)

Log Message:
-----------
Enabled the missing features (not tested)
bug-reports are welcome

Modified Paths:
--------------
    branches/soc-2009-jaguarandi/source/blender/render/intern/source/rayobject.c
    branches/soc-2009-jaguarandi/source/blender/render/intern/source/rayshade.c

Modified: branches/soc-2009-jaguarandi/source/blender/render/intern/source/rayobject.c
===================================================================
--- branches/soc-2009-jaguarandi/source/blender/render/intern/source/rayobject.c	2009-06-14 06:52:46 UTC (rev 20870)
+++ branches/soc-2009-jaguarandi/source/blender/render/intern/source/rayobject.c	2009-06-14 10:56:29 UTC (rev 20871)
@@ -266,8 +266,8 @@
 	if(casted_rays++ % (1<<20) == 0)
 		printf("Casting %d rays\n", casted_rays);
 
+/*
 	i->labda = 10000.0;
-/*
 	i->vec[0] *= i->labda;
 	i->vec[1] *= i->labda;
 	i->vec[2] *= i->labda;

Modified: branches/soc-2009-jaguarandi/source/blender/render/intern/source/rayshade.c
===================================================================
--- branches/soc-2009-jaguarandi/source/blender/render/intern/source/rayshade.c	2009-06-14 06:52:46 UTC (rev 20870)
+++ branches/soc-2009-jaguarandi/source/blender/render/intern/source/rayshade.c	2009-06-14 10:56:29 UTC (rev 20871)
@@ -1393,8 +1393,6 @@
 	ShadeInput shi;
 	ShadeResult shr;
 	
-	assert(0);
-
 	if(RE_rayobject_raycast(R.raytree, is)) {
 		float d= 1.0f;
 		/* we got a face */
@@ -1662,8 +1660,6 @@
 	float dxyview[3], skyadded=0, div;
 	int aocolor;
 	
-	assert(0);
-	
 	isec.orig.ob   = shi->obi;
 	isec.orig.face = shi->vlr;
 
@@ -1796,8 +1792,6 @@
 	float dxyview[3];
 	int j= -1, tot, actual=0, skyadded=0, aocolor, resol= R.wrld.aosamp;
 	
-	assert(0);
-	
 	isec.orig.ob   = shi->obi;
 	isec.orig.face = shi->vlr;
 
@@ -1979,8 +1973,6 @@
 	float jitco[RE_MAX_OSA][3];
 	int totjitco;
 
-//	assert(0);
-
 	colsq[0] = colsq[1] = colsq[2] = 0.0;
 	if(isec->mode==RE_RAY_SHADOW_TRA) {
 		shadfac[0]= shadfac[1]= shadfac[2]= shadfac[3]= 0.0f;
@@ -2071,7 +2063,6 @@
 		}
 
 		VECCOPY(isec->start, co);
-//		VECSUB(isec->vec, end, isec->start);
 		isec->vec[0] = end[0]-isec->start[0];
 		isec->vec[1] = end[1]-isec->start[1];
 		isec->vec[2] = end[2]-isec->start[2];
@@ -2135,8 +2126,6 @@
 	float fac=0.0f, div=0.0f, vec[3];
 	int a, j= -1, mask;
 	
-	assert(0);
-	
 	if(isec->mode==RE_RAY_SHADOW_TRA) {
 		shadfac[0]= shadfac[1]= shadfac[2]= shadfac[3]= 0.0f;
 	}
@@ -2265,11 +2254,8 @@
 				ray_trace_shadow_tra(&isec, shi, DEPTH_SHADOW_TRA, 0);
 				QUATCOPY(shadfac, isec.col);
 			}
-			else
-			{
-				assert(0);
-				if(RE_rayobject_raycast(R.raytree, &isec)) shadfac[3]= 0.0f;
-			}
+			else if(RE_rayobject_raycast(R.raytree, &isec))
+				shadfac[3]= 0.0f;
 		}
 		else {
 			ray_shadow_jitter(shi, lar, lampco, shadfac, &isec);