2008-04-16 22:40:48 +00:00
|
|
|
# ***** BEGIN GPL LICENSE BLOCK *****
|
2006-11-17 02:27:12 +00:00
|
|
|
#
|
|
|
|
# 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
|
2008-04-16 22:40:48 +00:00
|
|
|
# of the License, or (at your option) any later version.
|
2006-11-17 02:27:12 +00:00
|
|
|
#
|
|
|
|
# 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,
|
2010-02-12 13:34:04 +00:00
|
|
|
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
2006-11-17 02:27:12 +00:00
|
|
|
#
|
|
|
|
# The Original Code is Copyright (C) 2006, Blender Foundation
|
|
|
|
# All rights reserved.
|
|
|
|
#
|
|
|
|
# The Original Code is: all of this file.
|
|
|
|
#
|
|
|
|
# Contributor(s): Jacques Beaurain.
|
|
|
|
#
|
2008-04-16 22:40:48 +00:00
|
|
|
# ***** END GPL LICENSE BLOCK *****
|
2006-11-17 02:27:12 +00:00
|
|
|
|
|
|
|
|
2010-12-08 08:43:06 +00:00
|
|
|
set(INC
|
2010-09-07 01:13:10 +00:00
|
|
|
extern/include
|
2011-07-17 09:11:13 +00:00
|
|
|
intern/include
|
2012-03-03 21:42:21 +00:00
|
|
|
../blenfont
|
2011-07-17 09:11:13 +00:00
|
|
|
../blenkernel
|
2010-09-07 01:13:10 +00:00
|
|
|
../blenlib
|
2011-07-17 09:11:13 +00:00
|
|
|
../imbuf
|
2010-09-07 01:13:10 +00:00
|
|
|
../makesdna
|
2009-09-18 22:25:49 +00:00
|
|
|
../makesrna
|
2014-10-31 20:29:51 +01:00
|
|
|
../physics
|
2010-09-07 01:13:10 +00:00
|
|
|
../../../intern/guardedalloc
|
2011-07-17 09:11:13 +00:00
|
|
|
../../../intern/mikktspace
|
|
|
|
../../../intern/smoke/extern
|
2006-11-17 02:27:12 +00:00
|
|
|
)
|
|
|
|
|
2011-05-31 01:15:44 +00:00
|
|
|
set(INC_SYS
|
|
|
|
|
|
|
|
)
|
|
|
|
|
2010-12-08 08:43:06 +00:00
|
|
|
set(SRC
|
2010-10-23 04:05:55 +00:00
|
|
|
intern/raytrace/rayobject.cpp
|
Raytrace modifications from the Render Branch.
These should not have any effect on render results, except in some cases with
you have overlapping faces, where the noise seems to be slightly reduced.
There are some performance improvements, for simple scenes I wouldn't expect
more than 5-10% to be cut off the render time, for sintel scenes we got about
50% on average, that's with millions of polygons on intel quad cores. This
because memory access / cache misses were the main bottleneck for those scenes,
and the optimizations improve that.
Interal changes:
* Remove RE_raytrace.h, raytracer is now only used by render engine again.
* Split non-public parts rayobject.h into rayobject_internal.h, hopefully
makes it clearer how the API is used.
* Added rayintersection.h to contain some of the stuff from RE_raytrace.h
* Change Isect.vec/labda to Isect.dir/dist, previously vec was sometimes
normalized and sometimes not, confusing... now dir is always normalized
and dist contains the distance.
* Change VECCOPY and similar to BLI_math functions.
* Force inlining of auxiliary functions for ray-triangle/quad intersection,
helps a few percentages.
* Reorganize svbvh code so all the traversal functions are in one file
* Don't do test for root so that push_childs can be inlined
* Make shadow a template parameter so it doesn't need to be runtime checked
* Optimization in raytree building, was computing bounding boxes more often
than necessary.
* Leave out logf() factor in SAH, makes tree build quicker with no
noticeable influence on raytracing on performance?
* Set max childs to 4, simplifies traversal code a bit, but also seems
to help slightly in general.
* Store child pointers and child bb just as fixed arrays of size 4 in nodes,
nearly all nodes have this many children, so overall it actually reduces
memory usage a bit and avoids a pointer indirection.
2011-02-05 13:41:29 +00:00
|
|
|
intern/raytrace/rayobject_empty.cpp
|
|
|
|
intern/raytrace/rayobject_octree.cpp
|
|
|
|
intern/raytrace/rayobject_raycounter.cpp
|
|
|
|
intern/raytrace/rayobject_svbvh.cpp
|
|
|
|
intern/raytrace/rayobject_instance.cpp
|
2010-10-23 04:05:55 +00:00
|
|
|
intern/raytrace/rayobject_qbvh.cpp
|
|
|
|
intern/raytrace/rayobject_rtbuild.cpp
|
|
|
|
intern/raytrace/rayobject_vbvh.cpp
|
2013-01-23 13:13:16 +00:00
|
|
|
intern/source/bake.c
|
Bake API - bpy.ops.object.bake()
New operator that can calls a bake function to the current render engine when available. This commit provides no feature for the users, but allows external engines to be accessed by the operator and be integrated with the baking api.
The API itself is simple. Blender sends a populated array of BakePixels to the renderer, and gets back an array of floats with the result.
The Blender Internal (and multires) system is still running independent, but we eventually will pipe it through the API as well. Cycles baking will come next as a separated commit
Python Operator:
----------------
The operator can be called with some arguments, or a user interface can be created for it. In that case the arguments can be ommited and the interface can expose the settings from bpy.context.scene.render.bake
bpy.ops.object.bake(type='COMBINED', filepath="", width=512, height=512, margin=16, use_selected_to_active=False, cage_extrusion=0, cage="", normal_space='TANGENT', normal_r='POS_X', normal_g='POS_Y', normal_b='POS_Z', save_mode='INTERNAL', use_clear=False, use_split_materials=False, use_automatic_name=False)
Note: external save mode is currently disabled.
Supported Features:
------------------
* Margin - Baked result is extended this many pixels beyond the border of each UV "island," to soften seams in the texture.
* Selected to Active - bake shading on the surface of selected object to the active object. The rays are cast from the lowpoly object inwards towards the highpoly object. If the highpoly object is not entirely involved by the lowpoly object, you can tweak the rays start point with Cage Extrusion. For even more control of the cage you can use a Cage object.
* Cage Extrusion - distance to use for the inward ray cast when using selected to active
* Custom Cage - object to use as cage (instead of the lowpoly object).
* Normal swizzle - change the axis that gets mapped to RGB
* Normal space - save as tangent or object normal spaces
Supported Passes:
-----------------
Any pass that is supported by Blender renderlayer system. Though it's up to the external engine to provide a valid enum with its supported passes. Normal passes get a special treatment since we post-process them to converted and "swizzled"
Development Notes for External Engines:
---------------------------------------
(read them in bake_api.c)
* For a complete implementation example look at the Cycles Bake commit (next).
Review: D421
Reviewed by: Campbell Barton, Brecht van Lommel, Sergey Sharybin, Thomas Dinge
Normal map pipeline "consulting" by Andy Davies (metalliandy)
Original design by Brecht van Lommel.
The entire commit history can be found on the branch: bake-cycles
2014-01-02 19:05:07 -02:00
|
|
|
intern/source/bake_api.c
|
2010-10-23 04:05:55 +00:00
|
|
|
intern/source/convertblender.c
|
|
|
|
intern/source/envmap.c
|
2011-10-22 16:24:28 +00:00
|
|
|
intern/source/external_engine.c
|
2010-10-23 04:05:55 +00:00
|
|
|
intern/source/imagetexture.c
|
|
|
|
intern/source/initrender.c
|
2012-12-18 17:46:26 +00:00
|
|
|
intern/source/multires_bake.c
|
2010-10-23 04:05:55 +00:00
|
|
|
intern/source/occlusion.c
|
|
|
|
intern/source/pipeline.c
|
|
|
|
intern/source/pixelblending.c
|
|
|
|
intern/source/pixelshading.c
|
|
|
|
intern/source/pointdensity.c
|
|
|
|
intern/source/rayshade.c
|
|
|
|
intern/source/rendercore.c
|
2012-01-05 17:50:09 +00:00
|
|
|
intern/source/render_result.c
|
2011-02-05 13:10:20 +00:00
|
|
|
intern/source/render_texture.c
|
2010-10-23 04:05:55 +00:00
|
|
|
intern/source/renderdatabase.c
|
|
|
|
intern/source/shadbuf.c
|
|
|
|
intern/source/shadeinput.c
|
|
|
|
intern/source/shadeoutput.c
|
|
|
|
intern/source/sss.c
|
|
|
|
intern/source/strand.c
|
|
|
|
intern/source/sunsky.c
|
2011-11-13 12:17:27 +00:00
|
|
|
intern/source/texture_ocean.c
|
2010-10-23 04:05:55 +00:00
|
|
|
intern/source/volume_precache.c
|
|
|
|
intern/source/volumetric.c
|
|
|
|
intern/source/voxeldata.c
|
|
|
|
intern/source/zbuf.c
|
2010-11-29 04:35:56 +00:00
|
|
|
|
2011-10-22 16:24:28 +00:00
|
|
|
extern/include/RE_engine.h
|
Bake API - bpy.ops.object.bake()
New operator that can calls a bake function to the current render engine when available. This commit provides no feature for the users, but allows external engines to be accessed by the operator and be integrated with the baking api.
The API itself is simple. Blender sends a populated array of BakePixels to the renderer, and gets back an array of floats with the result.
The Blender Internal (and multires) system is still running independent, but we eventually will pipe it through the API as well. Cycles baking will come next as a separated commit
Python Operator:
----------------
The operator can be called with some arguments, or a user interface can be created for it. In that case the arguments can be ommited and the interface can expose the settings from bpy.context.scene.render.bake
bpy.ops.object.bake(type='COMBINED', filepath="", width=512, height=512, margin=16, use_selected_to_active=False, cage_extrusion=0, cage="", normal_space='TANGENT', normal_r='POS_X', normal_g='POS_Y', normal_b='POS_Z', save_mode='INTERNAL', use_clear=False, use_split_materials=False, use_automatic_name=False)
Note: external save mode is currently disabled.
Supported Features:
------------------
* Margin - Baked result is extended this many pixels beyond the border of each UV "island," to soften seams in the texture.
* Selected to Active - bake shading on the surface of selected object to the active object. The rays are cast from the lowpoly object inwards towards the highpoly object. If the highpoly object is not entirely involved by the lowpoly object, you can tweak the rays start point with Cage Extrusion. For even more control of the cage you can use a Cage object.
* Cage Extrusion - distance to use for the inward ray cast when using selected to active
* Custom Cage - object to use as cage (instead of the lowpoly object).
* Normal swizzle - change the axis that gets mapped to RGB
* Normal space - save as tangent or object normal spaces
Supported Passes:
-----------------
Any pass that is supported by Blender renderlayer system. Though it's up to the external engine to provide a valid enum with its supported passes. Normal passes get a special treatment since we post-process them to converted and "swizzled"
Development Notes for External Engines:
---------------------------------------
(read them in bake_api.c)
* For a complete implementation example look at the Cycles Bake commit (next).
Review: D421
Reviewed by: Campbell Barton, Brecht van Lommel, Sergey Sharybin, Thomas Dinge
Normal map pipeline "consulting" by Andy Davies (metalliandy)
Original design by Brecht van Lommel.
The entire commit history can be found on the branch: bake-cycles
2014-01-02 19:05:07 -02:00
|
|
|
extern/include/RE_bake.h
|
2012-12-18 17:46:26 +00:00
|
|
|
extern/include/RE_multires_bake.h
|
2010-11-29 04:35:56 +00:00
|
|
|
extern/include/RE_pipeline.h
|
|
|
|
extern/include/RE_render_ext.h
|
|
|
|
extern/include/RE_shader_ext.h
|
|
|
|
intern/include/envmap.h
|
|
|
|
intern/include/initrender.h
|
|
|
|
intern/include/occlusion.h
|
|
|
|
intern/include/pixelblending.h
|
|
|
|
intern/include/pixelshading.h
|
|
|
|
intern/include/pointdensity.h
|
|
|
|
intern/include/raycounter.h
|
|
|
|
intern/include/rayobject.h
|
Raytrace modifications from the Render Branch.
These should not have any effect on render results, except in some cases with
you have overlapping faces, where the noise seems to be slightly reduced.
There are some performance improvements, for simple scenes I wouldn't expect
more than 5-10% to be cut off the render time, for sintel scenes we got about
50% on average, that's with millions of polygons on intel quad cores. This
because memory access / cache misses were the main bottleneck for those scenes,
and the optimizations improve that.
Interal changes:
* Remove RE_raytrace.h, raytracer is now only used by render engine again.
* Split non-public parts rayobject.h into rayobject_internal.h, hopefully
makes it clearer how the API is used.
* Added rayintersection.h to contain some of the stuff from RE_raytrace.h
* Change Isect.vec/labda to Isect.dir/dist, previously vec was sometimes
normalized and sometimes not, confusing... now dir is always normalized
and dist contains the distance.
* Change VECCOPY and similar to BLI_math functions.
* Force inlining of auxiliary functions for ray-triangle/quad intersection,
helps a few percentages.
* Reorganize svbvh code so all the traversal functions are in one file
* Don't do test for root so that push_childs can be inlined
* Make shadow a template parameter so it doesn't need to be runtime checked
* Optimization in raytree building, was computing bounding boxes more often
than necessary.
* Leave out logf() factor in SAH, makes tree build quicker with no
noticeable influence on raytracing on performance?
* Set max childs to 4, simplifies traversal code a bit, but also seems
to help slightly in general.
* Store child pointers and child bb just as fixed arrays of size 4 in nodes,
nearly all nodes have this many children, so overall it actually reduces
memory usage a bit and avoids a pointer indirection.
2011-02-05 13:41:29 +00:00
|
|
|
intern/include/rayintersection.h
|
2010-11-29 04:35:56 +00:00
|
|
|
intern/include/render_types.h
|
2012-01-05 17:50:09 +00:00
|
|
|
intern/include/render_result.h
|
2010-11-29 04:35:56 +00:00
|
|
|
intern/include/rendercore.h
|
|
|
|
intern/include/renderdatabase.h
|
|
|
|
intern/include/renderpipeline.h
|
|
|
|
intern/include/shadbuf.h
|
|
|
|
intern/include/shading.h
|
|
|
|
intern/include/sss.h
|
|
|
|
intern/include/strand.h
|
|
|
|
intern/include/sunsky.h
|
|
|
|
intern/include/texture.h
|
2011-11-13 12:17:27 +00:00
|
|
|
intern/include/texture_ocean.h
|
2010-11-29 04:35:56 +00:00
|
|
|
intern/include/volume_precache.h
|
|
|
|
intern/include/volumetric.h
|
|
|
|
intern/include/voxeldata.h
|
|
|
|
intern/include/zbuf.h
|
|
|
|
intern/raytrace/bvh.h
|
|
|
|
intern/raytrace/rayobject_hint.h
|
2011-02-06 10:18:20 +00:00
|
|
|
intern/raytrace/rayobject_internal.h
|
2010-11-29 04:35:56 +00:00
|
|
|
intern/raytrace/rayobject_rtbuild.h
|
|
|
|
intern/raytrace/reorganize.h
|
|
|
|
intern/raytrace/svbvh.h
|
|
|
|
intern/raytrace/vbvh.h
|
2010-10-23 04:05:55 +00:00
|
|
|
)
|
|
|
|
|
2011-10-22 17:01:54 +00:00
|
|
|
if(WITH_PYTHON)
|
|
|
|
add_definitions(-DWITH_PYTHON)
|
|
|
|
list(APPEND INC
|
|
|
|
../python
|
|
|
|
)
|
|
|
|
endif()
|
|
|
|
|
2010-12-08 08:43:06 +00:00
|
|
|
if(WITH_IMAGE_OPENEXR)
|
|
|
|
add_definitions(-DWITH_OPENEXR)
|
|
|
|
endif()
|
2006-11-17 02:27:12 +00:00
|
|
|
|
2011-07-13 18:40:21 +00:00
|
|
|
if(WITH_MOD_SMOKE)
|
|
|
|
add_definitions(-DWITH_SMOKE)
|
|
|
|
endif()
|
|
|
|
|
2012-12-20 07:57:26 +00:00
|
|
|
if(WITH_FREESTYLE)
|
|
|
|
list(APPEND INC
|
|
|
|
../freestyle
|
|
|
|
)
|
|
|
|
add_definitions(-DWITH_FREESTYLE)
|
|
|
|
endif()
|
|
|
|
|
2010-12-08 08:43:06 +00:00
|
|
|
if(WITH_CODEC_QUICKTIME)
|
2011-07-16 23:01:14 +00:00
|
|
|
list(APPEND INC
|
|
|
|
../quicktime
|
|
|
|
)
|
|
|
|
list(APPEND INC_SYS
|
|
|
|
${QUICKTIME_INCLUDE_DIRS}
|
|
|
|
)
|
2010-12-08 08:43:06 +00:00
|
|
|
add_definitions(-DWITH_QUICKTIME)
|
|
|
|
endif()
|
2006-11-17 02:27:12 +00:00
|
|
|
|
2011-10-22 17:01:54 +00:00
|
|
|
if(WITH_GAMEENGINE)
|
|
|
|
add_definitions(-DWITH_GAMEENGINE)
|
|
|
|
endif()
|
|
|
|
|
2013-03-10 16:55:01 +00:00
|
|
|
if(WITH_INTERNATIONAL)
|
|
|
|
add_definitions(-DWITH_INTERNATIONAL)
|
|
|
|
endif()
|
|
|
|
|
2014-10-04 19:00:26 +06:00
|
|
|
if(WITH_CYCLES AND WITH_CYCLES_DEBUG)
|
|
|
|
add_definitions(-DWITH_CYCLES_DEBUG)
|
|
|
|
endif()
|
|
|
|
|
2010-12-08 08:43:06 +00:00
|
|
|
if(APPLE)
|
2013-03-24 12:13:13 +00:00
|
|
|
# SSE math is enabled by default on x86_64
|
2013-02-26 21:58:06 +00:00
|
|
|
if(CMAKE_OSX_ARCHITECTURES MATCHES "i386")
|
2010-12-08 08:43:06 +00:00
|
|
|
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -mfpmath=sse")
|
|
|
|
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -mfpmath=sse")
|
|
|
|
endif()
|
|
|
|
endif()
|
2009-11-09 17:52:13 +00:00
|
|
|
|
2011-05-31 01:15:44 +00:00
|
|
|
blender_add_lib_nolist(bf_render "${SRC}" "${INC}" "${INC_SYS}")
|