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-16 12:48:30 +00:00
|
|
|
# message(STATUS "Configuring blenderplayer")
|
2006-12-06 00:28:13 +00:00
|
|
|
|
2010-12-08 08:43:06 +00:00
|
|
|
setup_libdirs()
|
2006-11-17 02:27:12 +00:00
|
|
|
|
2010-12-08 08:43:06 +00:00
|
|
|
if(WITH_CODEC_QUICKTIME)
|
|
|
|
add_definitions(-DWITH_QUICKTIME)
|
|
|
|
endif()
|
2006-11-17 02:27:12 +00:00
|
|
|
|
2010-12-08 08:43:06 +00:00
|
|
|
if(WIN32 AND NOT UNIX)
|
2011-04-08 22:07:17 +00:00
|
|
|
string(SUBSTRING ${BLENDER_VERSION} 0 1 bver1)
|
|
|
|
string(SUBSTRING ${BLENDER_VERSION} 2 1 bver2)
|
|
|
|
string(SUBSTRING ${BLENDER_VERSION} 3 1 bver3)
|
2011-05-06 08:16:44 +00:00
|
|
|
if(MINGW)
|
|
|
|
add_definitions(
|
|
|
|
-DWINDRES
|
|
|
|
-DBLEN_VER_RC_STR_M=${BLENDER_VERSION}
|
|
|
|
-DBLEN_VER_RC_1=${bver1}
|
|
|
|
-DBLEN_VER_RC_2=${bver2}
|
|
|
|
-DBLEN_VER_RC_3=${bver3}
|
|
|
|
-DBLEN_VER_RC_4=0
|
|
|
|
)
|
|
|
|
else()
|
|
|
|
add_definitions(
|
|
|
|
-DBLEN_VER_RC_STR=${BLENDER_VERSION}
|
|
|
|
-DBLEN_VER_RC_1=${bver1}
|
|
|
|
-DBLEN_VER_RC_2=${bver2}
|
|
|
|
-DBLEN_VER_RC_3=${bver3}
|
|
|
|
-DBLEN_VER_RC_4=0
|
|
|
|
)
|
|
|
|
endif()
|
|
|
|
|
2012-06-07 01:44:22 +00:00
|
|
|
add_executable(blenderplayer ${EXETYPE} bad_level_call_stubs/stubs.c ../icons/winblender.rc)
|
2011-09-27 10:51:57 +00:00
|
|
|
|
2014-11-15 19:51:18 +00:00
|
|
|
install(TARGETS blenderplayer
|
|
|
|
COMPONENT Blenderplayer
|
|
|
|
DESTINATION ".")
|
|
|
|
|
2011-09-26 07:54:30 +00:00
|
|
|
elseif(APPLE)
|
2012-06-07 01:44:22 +00:00
|
|
|
add_executable(blenderplayer ${EXETYPE} bad_level_call_stubs/stubs.c)
|
2011-09-27 10:51:57 +00:00
|
|
|
# setup Info.plist
|
|
|
|
execute_process(COMMAND date "+%Y-%m-%d" OUTPUT_VARIABLE BLENDER_DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
|
2012-11-18 07:41:38 +00:00
|
|
|
set(PLAYER_SOURCEDIR ${CMAKE_SOURCE_DIR}/release/darwin/blenderplayer.app)
|
2011-09-27 10:51:57 +00:00
|
|
|
set(PLAYER_SOURCEINFO ${PLAYER_SOURCEDIR}/Contents/Info.plist)
|
|
|
|
set_target_properties(blenderplayer PROPERTIES
|
|
|
|
MACOSX_BUNDLE_INFO_PLIST ${PLAYER_SOURCEINFO}
|
|
|
|
MACOSX_BUNDLE_SHORT_VERSION_STRING ${BLENDER_VERSION}
|
|
|
|
MACOSX_BUNDLE_LONG_VERSION_STRING "${BLENDER_VERSION} ${BLENDER_DATE}")
|
|
|
|
|
2010-12-08 08:43:06 +00:00
|
|
|
else()
|
2012-06-07 01:44:22 +00:00
|
|
|
add_executable(blenderplayer bad_level_call_stubs/stubs.c)
|
2014-11-13 12:37:27 +00:00
|
|
|
|
|
|
|
if(NOT WITH_INSTALL_PORTABLE)
|
|
|
|
install(
|
|
|
|
TARGETS blenderplayer
|
|
|
|
DESTINATION bin
|
|
|
|
)
|
|
|
|
endif()
|
2010-12-08 08:43:06 +00:00
|
|
|
endif()
|
2006-11-17 02:27:12 +00:00
|
|
|
|
2010-12-08 08:43:06 +00:00
|
|
|
add_dependencies(blenderplayer makesdna)
|
2006-11-17 02:27:12 +00:00
|
|
|
|
2010-12-08 08:43:06 +00:00
|
|
|
get_property(BLENDER_LINK_LIBS GLOBAL PROPERTY BLENDER_LINK_LIBS)
|
2006-11-17 02:27:12 +00:00
|
|
|
|
2010-12-08 08:43:06 +00:00
|
|
|
list(APPEND BLENDER_LINK_LIBS
|
2010-12-06 10:56:37 +00:00
|
|
|
ge_player_common
|
|
|
|
ge_player_ghost
|
|
|
|
blenkernel_blc
|
|
|
|
)
|
2006-11-17 02:27:12 +00:00
|
|
|
|
2010-12-08 08:43:06 +00:00
|
|
|
if(CMAKE_SYSTEM_NAME MATCHES "Linux")
|
|
|
|
list(APPEND BLENDER_LINK_LIBS extern_binreloc)
|
|
|
|
endif()
|
2008-04-11 19:58:54 +00:00
|
|
|
|
2011-04-12 01:56:03 +00:00
|
|
|
# if(UNIX)
|
2009-09-06 01:51:23 +00:00
|
|
|
# Sort libraries
|
2010-12-08 08:43:06 +00:00
|
|
|
set(BLENDER_SORTED_LIBS
|
2010-11-18 11:42:05 +00:00
|
|
|
ge_player_ghost
|
|
|
|
ge_player_common
|
2010-08-24 04:29:23 +00:00
|
|
|
bf_intern_string
|
2010-10-16 09:27:02 +00:00
|
|
|
bf_intern_ghost
|
2013-11-05 18:57:45 +00:00
|
|
|
bf_intern_ghostndof3dconnexion
|
2009-09-06 01:51:23 +00:00
|
|
|
bf_rna
|
|
|
|
bf_blenkernel
|
Depsgraph: New dependency graph integration commit
This commit integrates the work done so far on the new dependency graph system,
where goal was to replace legacy depsgraph with the new one, supporting loads of
neat features like:
- More granular dependency relation nature, which solves issues with fake cycles
in the dependencies.
- Move towards all-animatable, by better integration of drivers into the system.
- Lay down some basis for upcoming copy-on-write, overrides and so on.
The new system is living side-by-side with the previous one and disabled by
default, so nothing will become suddenly broken. The way to enable new depsgraph
is to pass `--new-depsgraph` command line argument.
It's a bit early to consider the system production-ready, there are some TODOs
and issues were discovered during the merge period, they'll be addressed ASAP.
But it's important to merge, because it's the only way to attract artists to
really start testing this system.
There are number of assorted documents related on the design of the new system:
* http://wiki.blender.org/index.php/User:Aligorith/GSoC2013_Depsgraph#Design_Documents
* http://wiki.blender.org/index.php/User:Nazg-gul/DependencyGraph
There are also some user-related information online:
* http://code.blender.org/2015/02/blender-dependency-graph-branch-for-users/
* http://code.blender.org/2015/03/more-dependency-graph-tricks/
Kudos to everyone who was involved into the project:
- Joshua "Aligorith" Leung -- design specification, initial code
- Lukas "lukas_t" Toenne -- integrating code into blender, with further fixes
- Sergey "Sergey" "Sharybin" -- some mocking around, trying to wrap up the
project and so
- Bassam "slikdigit" Kurdali -- stressing the new system, reporting all the
issues and recording/writing documentation.
- Everyone else who i forgot to mention here :)
2015-05-12 10:05:57 +00:00
|
|
|
bf_depsgraph
|
2014-12-01 17:15:53 +00:00
|
|
|
bf_physics
|
2013-02-01 06:24:49 +00:00
|
|
|
bf_intern_rigidbody
|
2012-05-29 10:31:42 +00:00
|
|
|
bf_blenloader
|
2010-11-18 11:42:05 +00:00
|
|
|
ge_blen_routines
|
2010-11-12 07:16:33 +00:00
|
|
|
bf_editor_datafiles
|
2010-11-18 11:42:05 +00:00
|
|
|
ge_converter
|
|
|
|
ge_logic_ketsji
|
|
|
|
ge_phys_bullet
|
|
|
|
ge_phys_dummy
|
|
|
|
ge_logic
|
|
|
|
ge_rasterizer
|
|
|
|
ge_oglrasterizer
|
|
|
|
ge_logic_expressions
|
|
|
|
ge_scenegraph
|
2010-10-16 09:27:02 +00:00
|
|
|
bf_ikplugin
|
|
|
|
bf_intern_itasc
|
2012-08-18 13:36:29 +00:00
|
|
|
bf_intern_iksolver
|
2010-10-16 09:27:02 +00:00
|
|
|
bf_intern_smoke
|
2010-05-08 05:56:34 +00:00
|
|
|
bf_modifiers
|
2010-08-24 04:29:23 +00:00
|
|
|
bf_intern_moto
|
2009-09-06 01:51:23 +00:00
|
|
|
bf_nodes
|
|
|
|
bf_gpu
|
|
|
|
bf_imbuf
|
|
|
|
bf_avi
|
2010-11-18 11:42:05 +00:00
|
|
|
ge_logic_network
|
|
|
|
ge_logic_ngnetwork
|
|
|
|
ge_logic_loopbacknetwork
|
2009-09-06 01:51:23 +00:00
|
|
|
extern_bullet
|
2010-09-07 05:47:34 +00:00
|
|
|
bf_intern_guardedalloc
|
|
|
|
bf_intern_memutil
|
|
|
|
bf_python_ext
|
2011-07-15 04:01:47 +00:00
|
|
|
bf_python_mathutils
|
2012-02-22 18:57:17 +00:00
|
|
|
bf_python_bmesh
|
2012-03-21 12:35:39 +00:00
|
|
|
bf_intern_utfconv
|
2010-11-18 11:42:05 +00:00
|
|
|
bf_imbuf_cineon
|
|
|
|
bf_imbuf_openexr
|
2013-10-08 21:17:24 +00:00
|
|
|
bf_imbuf_openimageio
|
2011-04-18 07:11:40 +00:00
|
|
|
extern_openjpeg
|
|
|
|
extern_redcode
|
2010-11-18 11:42:05 +00:00
|
|
|
bf_imbuf_dds
|
2009-09-06 01:51:23 +00:00
|
|
|
bf_dna
|
2010-11-18 11:42:05 +00:00
|
|
|
ge_videotex
|
2009-09-06 01:51:23 +00:00
|
|
|
bf_blenfont
|
2015-08-16 07:32:01 +00:00
|
|
|
bf_blentranslation
|
2010-09-07 05:47:34 +00:00
|
|
|
bf_intern_audaspace
|
2009-09-06 01:51:23 +00:00
|
|
|
blenkernel_blc
|
2011-04-15 01:19:13 +00:00
|
|
|
bf_bmesh
|
2013-05-13 02:49:18 +00:00
|
|
|
bf_blenlib
|
2013-05-13 20:42:18 +00:00
|
|
|
bf_intern_utfconv
|
2009-09-06 01:51:23 +00:00
|
|
|
extern_binreloc
|
2010-09-15 19:03:52 +00:00
|
|
|
extern_minilzo
|
2010-10-16 09:27:02 +00:00
|
|
|
bf_intern_ghost # duplicate for linking
|
|
|
|
bf_blenkernel # duplicate for linking
|
2011-02-15 12:43:34 +00:00
|
|
|
bf_intern_mikktspace
|
partial fix for blenderplayer linking problems (decast retour)
This fix the problem of linking the extern components for the KX module.
The remaining linking issues are related to actual bad level access so the fix is a bit more complex.
Remaining linking issues (osx cmake gcc)
###########
Undefined symbols:
"_buildNavMeshDataByDerivedMesh", referenced from:
KX_NavMeshObject::BuildVertIndArrays(float*&, int&, unsigned short*&, int&, unsigned short*&, float*&, int&, unsigned short*&, int&, int&)in libge_logic_ketsji.a(KX_NavMeshObject.cpp.o)
_applyModifier in libbf_modifiers.a(MOD_navmesh.cpp.o)
"_polyIsConvex", referenced from:
_applyModifier in libbf_modifiers.a(MOD_navmesh.cpp.o)
"_polyNumVerts", referenced from:
KX_NavMeshObject::BuildVertIndArrays(float*&, int&, unsigned short*&, int&, unsigned short*&, float*&, int&, unsigned short*&, int&, int&)in libge_logic_ketsji.a(KX_NavMeshObject.cpp.o)
"_polyFindVertex", referenced from:
KX_NavMeshObject::BuildVertIndArrays(float*&, int&, unsigned short*&, int&, unsigned short*&, float*&, int&, unsigned short*&, int&, int&)in libge_logic_ketsji.a(KX_NavMeshObject.cpp.o)
KX_NavMeshObject::BuildVertIndArrays(float*&, int&, unsigned short*&, int&, unsigned short*&, float*&, int&, unsigned short*&, int&, int&)in libge_logic_ketsji.a(KX_NavMeshObject.cpp.o)
KX_NavMeshObject::BuildVertIndArrays(float*&, int&, unsigned short*&, int&, unsigned short*&, float*&, int&, unsigned short*&, int&, int&)in libge_logic_ketsji.a(KX_NavMeshObject.cpp.o)
############
2011-09-11 08:21:26 +00:00
|
|
|
extern_recastnavigation
|
2012-06-04 16:42:58 +00:00
|
|
|
bf_intern_raskter
|
Color Management, Stage 2: Switch color pipeline to use OpenColorIO
Replace old color pipeline which was supporting linear/sRGB color spaces
only with OpenColorIO-based pipeline.
This introduces two configurable color spaces:
- Input color space for images and movie clips. This space is used to convert
images/movies from color space in which file is saved to Blender's linear
space (for float images, byte images are not internally converted, only input
space is stored for such images and used later).
This setting could be found in image/clip data block settings.
- Display color space which defines space in which particular display is working.
This settings could be found in scene's Color Management panel.
When render result is being displayed on the screen, apart from converting image
to display space, some additional conversions could happen.
This conversions are:
- View, which defines tone curve applying before display transformation.
These are different ways to view the image on the same display device.
For example it could be used to emulate film view on sRGB display.
- Exposure affects on image exposure before tone map is applied.
- Gamma is post-display gamma correction, could be used to match particular
display gamma.
- RGB curves are user-defined curves which are applying before display
transformation, could be used for different purposes.
All this settings by default are only applying on render result and does not
affect on other images. If some particular image needs to be affected by this
transformation, "View as Render" setting of image data block should be set to
truth. Movie clips are always affected by all display transformations.
This commit also introduces configurable color space in which sequencer is
working. This setting could be found in scene's Color Management panel and
it should be used if such stuff as grading needs to be done in color space
different from sRGB (i.e. when Film view on sRGB display is use, using VD16
space as sequencer's internal space would make grading working in space
which is close to the space using for display).
Some technical notes:
- Image buffer's float buffer is now always in linear space, even if it was
created from 16bit byte images.
- Space of byte buffer is stored in image buffer's rect_colorspace property.
- Profile of image buffer was removed since it's not longer meaningful.
- OpenGL and GLSL is supposed to always work in sRGB space. It is possible
to support other spaces, but it's quite large project which isn't so
much important.
- Legacy Color Management option disabled is emulated by using None display.
It could have some regressions, but there's no clear way to avoid them.
- If OpenColorIO is disabled on build time, it should make blender behaving
in the same way as previous release with color management enabled.
More details could be found at this page (more details would be added soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.64/Color_Management
--
Thanks to Xavier Thomas, Lukas Toene for initial work on OpenColorIO
integration and to Brecht van Lommel for some further development and code/
usecase review!
2012-09-15 10:05:07 +00:00
|
|
|
bf_intern_opencolorio
|
2012-10-24 19:24:55 +00:00
|
|
|
bf_intern_opennl
|
2014-10-07 21:28:28 +00:00
|
|
|
bf_intern_glew_mx
|
2012-12-30 18:20:52 +00:00
|
|
|
extern_rangetree
|
2013-03-12 07:25:53 +00:00
|
|
|
extern_wcwidth
|
2013-05-12 22:17:37 +00:00
|
|
|
extern_libmv
|
2014-06-18 12:49:17 +00:00
|
|
|
extern_glog
|
2014-11-17 11:35:36 +00:00
|
|
|
extern_sdlew
|
2015-07-13 15:40:06 +00:00
|
|
|
extern_eigen3
|
2009-09-06 01:51:23 +00:00
|
|
|
)
|
|
|
|
|
2011-07-04 13:03:41 +00:00
|
|
|
if(WITH_MOD_CLOTH_ELTOPO)
|
|
|
|
list(APPEND BLENDER_SORTED_LIBS extern_eltopo)
|
|
|
|
endif()
|
|
|
|
|
2012-06-23 13:42:14 +00:00
|
|
|
if(NOT WITH_SYSTEM_GLEW)
|
2014-10-07 20:46:19 +00:00
|
|
|
list(APPEND BLENDER_SORTED_LIBS ${BLENDER_GLEW_LIBRARIES})
|
2011-04-12 01:56:03 +00:00
|
|
|
endif()
|
2011-04-05 23:31:01 +00:00
|
|
|
|
2011-03-05 09:27:14 +00:00
|
|
|
if(WITH_LZMA)
|
|
|
|
list(APPEND BLENDER_SORTED_LIBS extern_lzma)
|
|
|
|
endif()
|
|
|
|
|
2011-11-07 12:55:18 +00:00
|
|
|
if(WITH_LIBMV)
|
2012-06-10 15:27:41 +00:00
|
|
|
list(APPEND BLENDER_SORTED_LIBS extern_ceres)
|
2011-11-07 12:55:18 +00:00
|
|
|
endif()
|
|
|
|
|
|
|
|
list(APPEND BLENDER_SORTED_LIBS extern_colamd)
|
|
|
|
|
2012-08-02 16:42:30 +00:00
|
|
|
if(WITH_MOD_BOOLEAN)
|
2012-01-16 18:49:10 +00:00
|
|
|
list(APPEND BLENDER_SORTED_LIBS extern_carve)
|
|
|
|
endif()
|
|
|
|
|
2012-02-17 20:59:21 +00:00
|
|
|
if(WITH_GHOST_XDND)
|
|
|
|
list(APPEND BLENDER_SORTED_LIBS extern_xdnd)
|
|
|
|
endif()
|
|
|
|
|
2010-12-08 08:43:06 +00:00
|
|
|
if(WITH_CODEC_QUICKTIME)
|
|
|
|
list(APPEND BLENDER_SORTED_LIBS bf_quicktime)
|
|
|
|
endif()
|
|
|
|
|
|
|
|
if(WITH_CXX_GUARDEDALLOC)
|
|
|
|
list(APPEND BLENDER_SORTED_LIBS bf_intern_guardedalloc_cpp)
|
|
|
|
endif()
|
|
|
|
|
2012-11-11 16:54:26 +00:00
|
|
|
if(WITH_INTERNATIONAL)
|
|
|
|
list(APPEND BLENDER_SORTED_LIBS bf_intern_locale)
|
|
|
|
endif()
|
|
|
|
|
2015-07-20 14:08:06 +00:00
|
|
|
if(WITH_OPENSUBDIV)
|
|
|
|
list(APPEND BLENDER_SORTED_LIBS bf_intern_opensubdiv)
|
|
|
|
endif()
|
|
|
|
|
2010-12-08 08:43:06 +00:00
|
|
|
foreach(SORTLIB ${BLENDER_SORTED_LIBS})
|
|
|
|
set(REMLIB ${SORTLIB})
|
|
|
|
foreach(SEARCHLIB ${BLENDER_LINK_LIBS})
|
|
|
|
if(${SEARCHLIB} STREQUAL ${SORTLIB})
|
|
|
|
set(REMLIB "")
|
|
|
|
endif()
|
|
|
|
endforeach()
|
|
|
|
if(REMLIB)
|
2010-12-16 12:48:30 +00:00
|
|
|
# message(STATUS "Removing library ${REMLIB} from blenderplayer linking because: not configured")
|
|
|
|
list(APPEND REM_MSG ${REMLIB})
|
2010-12-08 08:43:06 +00:00
|
|
|
list(REMOVE_ITEM BLENDER_SORTED_LIBS ${REMLIB})
|
|
|
|
endif()
|
|
|
|
endforeach()
|
2010-12-17 04:41:48 +00:00
|
|
|
if(REM_MSG)
|
|
|
|
list(SORT REM_MSG)
|
|
|
|
message(STATUS "Player Skipping: (${REM_MSG})")
|
|
|
|
endif()
|
2010-12-08 08:43:06 +00:00
|
|
|
target_link_libraries(blenderplayer ${BLENDER_SORTED_LIBS})
|
2011-06-11 06:00:28 +00:00
|
|
|
|
|
|
|
unset(SEARCHLIB)
|
|
|
|
unset(SORTLIB)
|
|
|
|
unset(REMLIB)
|
|
|
|
unset(REM_MSG)
|
|
|
|
|
2011-04-12 01:56:03 +00:00
|
|
|
# else()
|
|
|
|
# target_link_libraries(blenderplayer ${BLENDER_LINK_LIBS})
|
|
|
|
# endif()
|
2010-12-08 08:43:06 +00:00
|
|
|
|
|
|
|
if(WITH_PLAYER)
|
|
|
|
add_subdirectory(bad_level_call_stubs)
|
|
|
|
endif()
|
|
|
|
|
|
|
|
setup_liblinks(blenderplayer)
|
2014-08-05 07:57:50 +00:00
|
|
|
|
|
|
|
# We put CLEW and CUEW here because OPENSUBDIV_LIBRARIES dpeends on them..
|
|
|
|
if(WITH_CYCLES OR WITH_COMPOSITOR OR WITH_OPENSUBDIV)
|
|
|
|
target_link_libraries(blenderplayer "extern_clew")
|
|
|
|
target_link_libraries(blenderplayer "extern_cuew")
|
|
|
|
endif()
|