[Bf-committers] [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23649] trunk/blender: Merged Soc 2009 - raytrace optimization [0]

[lguillaume]

2009/10/6 Andre Susano Pinto <andresusanopinto at gmail.com>

> Revision: 23649
>
> http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23649
> Author:   jaguarandi
> Date:     2009-10-06 04:56:11 +0200 (Tue, 06 Oct 2009)
>
> Log Message:
> -----------
> Merged Soc 2009 - raytrace optimization [0]
> from branch [1] at rev 23647
>
> [0] - http://wiki.blender.org/index.php/User:Jaguarandi/SummerOfCode2009/
> [1] -
> https://svn.blender.org/svnroot/bf-blender/branches/soc-2009-jaguarandi
>
On msvc express 2008 32bits I have 2 error C2668 (
http://msdn.microsoft.com/en-us/library/da60x087%28VS.71%29.aspx )in
source\blender\render\intern\raytrace\rayobject_rtbuild.cpp on the logf
function, corrected with :

Index: rayobject_rtbuild.cpp
===================================================================
--- rayobject_rtbuild.cpp    (révision 23653)
+++ rayobject_rtbuild.cpp    (copie de travail)
@@ -362,8 +362,8 @@
                 //Worst case heuristic (cost of each child is linear)
                 float hcost, left_side, right_side;

-                left_side = bb_area(sweep_left.bb, sweep_left.bb
+3)*(sweep_left.cost+logf(i));
-                right_side= bb_area(sweep[i].bb,
sweep[i].bb+3)*(sweep[i].cost+logf(size-i));
+                left_side = bb_area(sweep_left.bb, sweep_left.bb
+3)*(sweep_left.cost+logf((float)i));
+                right_side= bb_area(sweep[i].bb,
sweep[i].bb+3)*(sweep[i].cost+logf((float)(size-i)));
                 hcost = left_side+right_side;

                 assert(left_side >= 0);