[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59618] branches/soc-2013-cycles_mblur: Merged trunk into branch.

Gavin Howard gavin.d.howard at gmail.com
Thu Aug 29 03:08:01 CEST 2013


Revision: 59618
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59618
Author:   gdh
Date:     2013-08-29 01:08:00 +0000 (Thu, 29 Aug 2013)
Log Message:
-----------
Merged trunk into branch. Includes r59578 to r59616.

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59578
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59616

Modified Paths:
--------------
    branches/soc-2013-cycles_mblur/CMakeLists.txt
    branches/soc-2013-cycles_mblur/build_files/cmake/Modules/FindPythonLibsUnix.cmake
    branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_shader.cpp
    branches/soc-2013-cycles_mblur/intern/cycles/kernel/closure/bssrdf.h
    branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel.cl
    branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_types.h
    branches/soc-2013-cycles_mblur/intern/cycles/kernel/shaders/node_sky_texture.osl
    branches/soc-2013-cycles_mblur/intern/cycles/kernel/svm/svm.h
    branches/soc-2013-cycles_mblur/intern/cycles/kernel/svm/svm_sky.h
    branches/soc-2013-cycles_mblur/intern/cycles/kernel/svm/svm_types.h
    branches/soc-2013-cycles_mblur/intern/cycles/render/CMakeLists.txt
    branches/soc-2013-cycles_mblur/intern/cycles/render/nodes.cpp
    branches/soc-2013-cycles_mblur/intern/cycles/render/nodes.h
    branches/soc-2013-cycles_mblur/intern/cycles/render/svm.cpp
    branches/soc-2013-cycles_mblur/intern/cycles/render/svm.h
    branches/soc-2013-cycles_mblur/intern/guardedalloc/intern/mallocn.c
    branches/soc-2013-cycles_mblur/intern/tools/bpy_introspect_ui.py
    branches/soc-2013-cycles_mblur/release/scripts/modules/addon_utils.py
    branches/soc-2013-cycles_mblur/release/scripts/modules/bl_i18n_utils/utils.py
    branches/soc-2013-cycles_mblur/release/scripts/startup/bl_operators/wm.py
    branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/__init__.py
    branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/space_node.py
    branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/space_userpref.py
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/displist.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/editmesh.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/mask_rasterize.c
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/mesh.c
    branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_callbacks.h
    branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_scanfill.h
    branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/fileops.c
    branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/math_base_inline.c
    branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/scanfill.c
    branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_removedoubles.c
    branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface_handlers.c
    branches/soc-2013-cycles_mblur/source/blender/editors/object/object_transform.c
    branches/soc-2013-cycles_mblur/source/blender/editors/render/render_preview.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_file/filelist.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_node/drawnode.c
    branches/soc-2013-cycles_mblur/source/blender/makesdna/DNA_node_types.h
    branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_nodetree.c
    branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_object.c
    branches/soc-2013-cycles_mblur/source/blender/modifiers/intern/MOD_array.c
    branches/soc-2013-cycles_mblur/source/blender/nodes/shader/nodes/node_shader_tex_sky.c
    branches/soc-2013-cycles_mblur/source/blender/windowmanager/WM_api.h
    branches/soc-2013-cycles_mblur/source/blender/windowmanager/intern/wm_event_system.c
    branches/soc-2013-cycles_mblur/source/blender/windowmanager/intern/wm_jobs.c
    branches/soc-2013-cycles_mblur/source/creator/creator.c
    branches/soc-2013-cycles_mblur/source/gameengine/Rasterizer/RAS_MeshObject.cpp

Added Paths:
-----------
    branches/soc-2013-cycles_mblur/intern/cycles/render/sky_model.cpp
    branches/soc-2013-cycles_mblur/intern/cycles/render/sky_model.h
    branches/soc-2013-cycles_mblur/intern/cycles/render/sky_model_data.h

Property Changed:
----------------
    branches/soc-2013-cycles_mblur/


Property changes on: branches/soc-2013-cycles_mblur
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/ge_dev:58091-58422
/branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573,58822,58989
/branches/soc-2013-depsgraph_mt:57516,57900,57939-57940,57945,57958-57961,58151,58155-58156,58169,58277-58279,58282-58283,58711,58787,58789,58796,59086-59087,59163,59166,59170,59181,59259-59260
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-59577
   + /branches/ge_dev:58091-58422
/branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573,58822,58989
/branches/soc-2013-depsgraph_mt:57516,57900,57939-57940,57945,57958-57961,58151,58155-58156,58169,58277-58279,58282-58283,58711,58787,58789,58796,59086-59087,59163,59166,59170,59181,59259-59260
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032,59214,59220,59251,59601
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-59616

Modified: branches/soc-2013-cycles_mblur/CMakeLists.txt
===================================================================
--- branches/soc-2013-cycles_mblur/CMakeLists.txt	2013-08-29 00:14:57 UTC (rev 59617)
+++ branches/soc-2013-cycles_mblur/CMakeLists.txt	2013-08-29 01:08:00 UTC (rev 59618)
@@ -771,14 +771,14 @@
 		endif()
 
 		if(LLVM_DIRECTORY)
-			FIND_PROGRAM(LLVM_CONFIG llvm-config-${LLVM_VERSION} HINTS ${LLVM_DIRECTORY}/bin NO_CMAKE_PATH)
+			find_program(LLVM_CONFIG llvm-config-${LLVM_VERSION} HINTS ${LLVM_DIRECTORY}/bin NO_CMAKE_PATH)
 			if(NOT LLVM_CONFIG)
-				FIND_PROGRAM(LLVM_CONFIG llvm-config HINTS ${LLVM_DIRECTORY}/bin NO_CMAKE_PATH)
+				find_program(LLVM_CONFIG llvm-config HINTS ${LLVM_DIRECTORY}/bin NO_CMAKE_PATH)
 			endif()
 		else()
-			FIND_PROGRAM(LLVM_CONFIG llvm-config-${LLVM_VERSION})
+			find_program(LLVM_CONFIG llvm-config-${LLVM_VERSION})
 			if(NOT LLVM_CONFIG)
-				FIND_PROGRAM(LLVM_CONFIG llvm-config)
+				find_program(LLVM_CONFIG llvm-config)
 			endif()
 		endif()
 		execute_process(COMMAND ${LLVM_CONFIG} --version
@@ -2145,6 +2145,23 @@
 set(CMAKE_C_FLAGS "${C_WARNINGS} ${CMAKE_C_FLAGS} ${PLATFORM_CFLAGS}")
 set(CMAKE_CXX_FLAGS "${CXX_WARNINGS} ${CMAKE_CXX_FLAGS} ${PLATFORM_CFLAGS}")
 
+# defined above, platform spesific but shared names
+mark_as_advanced(
+	CYCLES_OSL
+	OSL_LIB_EXEC
+	OSL_COMPILER
+	OSL_LIB_COMP
+	OSL_LIB_QUERY
+	OSL_INCLUDES
+)
+
+mark_as_advanced(
+	LLVM_CONFIG
+	LLVM_DIRECTORY
+	LLVM_LIBRARY
+	LLVM_VERSION
+)
+
 #-------------------------------------------------------------------------------
 # Global Defines
 

Modified: branches/soc-2013-cycles_mblur/build_files/cmake/Modules/FindPythonLibsUnix.cmake
===================================================================
--- branches/soc-2013-cycles_mblur/build_files/cmake/Modules/FindPythonLibsUnix.cmake	2013-08-29 00:14:57 UTC (rev 59617)
+++ branches/soc-2013-cycles_mblur/build_files/cmake/Modules/FindPythonLibsUnix.cmake	2013-08-29 01:08:00 UTC (rev 59618)
@@ -199,4 +199,5 @@
   PYTHON_INCLUDE_DIR
   PYTHON_INCLUDE_CONFIG_DIR
   PYTHON_LIBRARY
+  PYTHON_LIBPATH
 )

Modified: branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_shader.cpp
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_shader.cpp	2013-08-29 00:14:57 UTC (rev 59617)
+++ branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_shader.cpp	2013-08-29 01:08:00 UTC (rev 59618)
@@ -632,8 +632,10 @@
 	else if (b_node.is_a(&RNA_ShaderNodeTexSky)) {
 		BL::ShaderNodeTexSky b_sky_node(b_node);
 		SkyTextureNode *sky = new SkyTextureNode();
+		sky->type = SkyTextureNode::type_enum[(int)b_sky_node.sky_type()];
 		sky->sun_direction = get_float3(b_sky_node.sun_direction());
 		sky->turbidity = b_sky_node.turbidity();
+		sky->ground_albedo = b_sky_node.ground_albedo();
 		get_tex_mapping(&sky->tex_mapping, b_sky_node.texture_mapping());
 		node = sky;
 	}

Modified: branches/soc-2013-cycles_mblur/intern/cycles/kernel/closure/bssrdf.h
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/kernel/closure/bssrdf.h	2013-08-29 00:14:57 UTC (rev 59617)
+++ branches/soc-2013-cycles_mblur/intern/cycles/kernel/closure/bssrdf.h	2013-08-29 01:08:00 UTC (rev 59618)
@@ -50,7 +50,7 @@
 {
 	/* integrate (2*pi*r * exp(-r*r/(2*v)))/(2*pi*v)) from 0 to Rm
 	 * = 1 - exp(-Rm*Rm/(2*v)) */
-	const float v = sc->data0;
+	const float v = sc->data0*sc->data0*(0.25f*0.25f);
 	const float Rm = sqrtf(v*GAUSS_TRUNCATE);
 
 	if(r >= Rm)
@@ -72,7 +72,7 @@
 	/* xi = integrate (2*pi*r * exp(-r*r/(2*v)))/(2*pi*v)) = -exp(-r^2/(2*v))
 	 * r = sqrt(-2*v*logf(xi)) */
 
-	const float v = sc->data0;
+	const float v = sc->data0*sc->data0*(0.25f*0.25f);
 	const float Rm = sqrtf(v*GAUSS_TRUNCATE);
 
 	/* 1.0 - expf(-Rm*Rm/(2*v)) simplified */

Modified: branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel.cl
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel.cl	2013-08-29 00:14:57 UTC (rev 59617)
+++ branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel.cl	2013-08-29 01:08:00 UTC (rev 59618)
@@ -49,7 +49,7 @@
 	int y = sy + get_global_id(1);
 
 	if(x < sx + sw && y < sy + sh)
-		kernel_path_trace_progressive(kg, buffer, rng_state, sample, x, y, offset, stride);
+		kernel_path_trace(kg, buffer, rng_state, sample, x, y, offset, stride);
 }
 
 __kernel void kernel_ocl_tonemap(

Modified: branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_types.h
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_types.h	2013-08-29 00:14:57 UTC (rev 59617)
+++ branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_types.h	2013-08-29 01:08:00 UTC (rev 59618)
@@ -719,16 +719,6 @@
 	float ao_distance;
 } KernelBackground;
 
-typedef struct KernelSunSky {
-	/* sun direction in spherical and cartesian */
-	float theta, phi, pad3, pad4;
-
-	/* perez function parameters */
-	float zenith_Y, zenith_x, zenith_y, pad2;
-	float perez_Y[5], perez_x[5], perez_y[5];
-	float pad5;
-} KernelSunSky;
-
 typedef struct KernelIntegrator {
 	/* emission */
 	int use_direct_light;
@@ -839,7 +829,6 @@
 	KernelCamera cam;
 	KernelFilm film;
 	KernelBackground background;
-	KernelSunSky sunsky;
 	KernelIntegrator integrator;
 	KernelBVH bvh;
 	KernelCurves curve;

Modified: branches/soc-2013-cycles_mblur/intern/cycles/kernel/shaders/node_sky_texture.osl
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/kernel/shaders/node_sky_texture.osl	2013-08-29 00:14:57 UTC (rev 59617)
+++ branches/soc-2013-cycles_mblur/intern/cycles/kernel/shaders/node_sky_texture.osl	2013-08-29 01:08:00 UTC (rev 59618)
@@ -17,16 +17,6 @@
 #include "stdosl.h"
 #include "node_color.h"
 
-struct KernelSunSky {
-	/* sun direction in spherical and cartesian */
-	float theta, phi;
-	vector dir;
-
-	/* perez function parameters */
-	float zenith_Y, zenith_x, zenith_y;
-	float perez_Y[5], perez_x[5], perez_y[5];
-};
-
 float sky_angle_between(float thetav, float phiv, float theta, float phi)
 {
 	float cospsi = sin(thetav) * sin(theta) * cos(phi - phiv) + cos(thetav) * cos(theta);
@@ -44,7 +34,8 @@
 	return vector(acos(dir[2]), atan2(dir[0], dir[1]), 0);
 }
 
-float sky_perez_function(float lam[5], float theta, float gamma)
+/* Preetham */
+float sky_perez_function(float lam[9], float theta, float gamma)
 {
 	float ctheta = cos(theta);
 	float cgamma = cos(gamma);
@@ -52,7 +43,9 @@
 	return (1.0 + lam[0] * exp(lam[1] / ctheta)) * (1.0 + lam[2] * exp(lam[3] * gamma) + lam[4] * cgamma * cgamma);
 }
 
-color sky_xyz_radiance(KernelSunSky sunsky, vector dir)
+color sky_radiance_old(normal dir,
+                   float sunphi, float suntheta, color radiance,
+                   float config_x[9], float config_y[9], float config_z[9])
 {
 	/* convert vector to spherical coordinates */
 	vector spherical = sky_spherical_coordinates(dir);
@@ -60,89 +53,81 @@
 	float phi = spherical[1];
 
 	/* angle between sun direction and dir */
-	float gamma = sky_angle_between(theta, phi, sunsky.theta, sunsky.phi);
+	float gamma = sky_angle_between(theta, phi, suntheta, sunphi);
 
 	/* clamp theta to horizon */
 	theta = min(theta, M_PI_2 - 0.001);
 
 	/* compute xyY color space values */
-	float x = sunsky.zenith_x * sky_perez_function(sunsky.perez_x, theta, gamma);
-	float y = sunsky.zenith_y * sky_perez_function(sunsky.perez_y, theta, gamma);
-	float Y = sunsky.zenith_Y * sky_perez_function(sunsky.perez_Y, theta, gamma);
+	float x = radiance[1] * sky_perez_function(config_y, theta, gamma);
+	float y = radiance[2] * sky_perez_function(config_z, theta, gamma);
+	float Y = radiance[0] * sky_perez_function(config_x, theta, gamma);
 
 	/* convert to RGB */
 	color xyz = xyY_to_xyz(x, y, Y);
 	return xyz_to_rgb(xyz[0], xyz[1], xyz[2]);
 }
 

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list