UPBGE: Fix compound ray cast with triangle child shape.

.gitignore

@@ -9,10 +9,14 @@ __pycache__/
 *~
 *.swp
 *.swo
+*.kdev4
 *#
 
 # QtCreator
 CMakeLists.txt.user
+*.config
+*.files
+*.includes
 
 # ms-windows
 Thumbs.db

.gitmodules

@@ -1,20 +1,20 @@
 [submodule "release/scripts/addons"]
 	path = release/scripts/addons
-	url = ../blender-addons.git
+	url = https://github.com/UPBGE/blender-addons.git
 	ignore = all
 	branch = master
 [submodule "release/scripts/addons_contrib"]
 	path = release/scripts/addons_contrib
-	url = ../blender-addons-contrib.git
+	url = git://git.blender.org/blender-addons-contrib.git
 	ignore = all
 	branch = master
 [submodule "release/datafiles/locale"]
 	path = release/datafiles/locale
-	url = ../blender-translations.git
+	url = git://git.blender.org/blender-translations.git
 	ignore = all
 	branch = master
 [submodule "source/tools"]
 	path = source/tools
-	url = ../blender-dev-tools.git
+	url = git://git.blender.org/blender-dev-tools.git
 	ignore = all
 	branch = master

CMakeLists.txt

@@ -227,12 +227,23 @@ option(WITH_BULLET        "Enable Bullet (Physics Engine)" ON)
 option(WITH_SYSTEM_BULLET "Use the systems bullet library (currently unsupported due to missing features in upstream!)" )
 mark_as_advanced(WITH_SYSTEM_BULLET)
 option(WITH_GAMEENGINE    "Enable Game Engine" ${_init_GAMEENGINE})
+
+option(WITH_GAMEENGINE_SECURITY "Disable game engine python debugging tools" OFF)
+mark_as_advanced(WITH_GAMEENGINE_SECURITY)
+
+option(WITH_GAMEENGINE_GPU_SYNC "Enable GPU synchronization for VideoTexture module image rendering (ImageRender)" OFF)
+mark_as_advanced(WITH_GAMEENGINE_GPU_SYNC)
+
 if(APPLE)
 	set(WITH_GAMEENGINE_DECKLINK OFF)
 else()
 	option(WITH_GAMEENGINE_DECKLINK "Support BlackMagicDesign DeckLink cards in the Game Engine" ON)
 endif()
-option(WITH_PLAYER        "Build Player" OFF)
+
+option(WITH_GAMEENGINE_BPPLAYER "Enable Blend encrypted (from BPPlayer application) reading capabilities" ON)
+mark_as_advanced(WITH_GAMEENGINE_BPPLAYER)
+
+option(WITH_PLAYER        "Build Player" ON)
 option(WITH_OPENCOLORIO   "Enable OpenColorIO color management" ${_init_OPENCOLORIO})
 
 # Compositor
@@ -277,6 +288,7 @@ endif()
 
 if(WITH_X11)
 	option(WITH_X11_XINPUT    "Enable X11 Xinput (tablet support and unicode input)"  ON)
+	option(WITH_X11_XINERAMA  "Enable multi-monitor support"                          ON)
 	option(WITH_X11_XF86VMODE "Enable X11 video mode switching"                       ON)
 	option(WITH_X11_XFIXES    "Enable X11 XWayland cursor warping workaround"         ON)
 	option(WITH_X11_ALPHA     "Enable X11 transparent background"                     ON)
@@ -527,6 +539,16 @@ if(CMAKE_COMPILER_IS_GNUCC)
 	mark_as_advanced(WITH_LINKER_GOLD)
 endif()
 
+# GCCFilter, if appliciable
+if(CMAKE_COMPILER_IS_GNUCC)
+  option(WITH_COLOR_GCC "Use GCCFilter to color compiler output messages" OFF)
+  set(COLOR_GCC_OPTIONS "-c -r -w" CACHE STRING "Arguments that are passed to gccfilter when output coloring is switchend on. Defaults to -c -r -w.")
+  mark_as_advanced(COLOR_GCC_OPTIONS)
+  if(WITH_COLOR_GCC)
+    set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CMAKE_SOURCE_DIR}/build_files/utils/gccfilter ${COLOR_GCC_OPTIONS}")
+  endif()
+endif()
+
 if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
 	option(WITH_COMPILER_ASAN "Build and link against address sanitizer (only for Debug & RelWithDebInfo targets)." OFF)
 	mark_as_advanced(WITH_COMPILER_ASAN)
@@ -643,9 +665,6 @@ if(NOT WITH_AUDASPACE)
 	if(WITH_JACK)
 		message(FATAL_ERROR "WITH_JACK requires WITH_AUDASPACE")
 	endif()
-	if(WITH_GAMEENGINE)
-		message(FATAL_ERROR "WITH_GAMEENGINE requires WITH_AUDASPACE")
-	endif()
 endif()
 
 if(NOT WITH_SDL AND WITH_GHOST_SDL)
@@ -734,6 +753,7 @@ endif()
 if(WITH_GHOST_SDL OR WITH_HEADLESS)
 	set(WITH_X11           OFF)
 	set(WITH_X11_XINPUT    OFF)
+	set(WITH_X11_XINERAMA  OFF)
 	set(WITH_X11_XF86VMODE OFF)
 	set(WITH_X11_XFIXES    OFF)
 	set(WITH_X11_ALPHA     OFF)
@@ -900,6 +920,14 @@ if(WITH_X11)
 		endif()
 	endif()
 
+	if(WITH_X11_XINERAMA)
+		if(X11_Xinerama_LIB)
+			list(APPEND PLATFORM_LINKLIBS ${X11_Xinerama_LIB})
+		else()
+			set(WITH_X11_XINERAMA OFF)
+		endif()
+	endif()
+
 	if(WITH_X11_XF86VMODE)
 		# XXX, why dont cmake make this available?
 		find_library(X11_Xxf86vmode_LIB Xxf86vm   ${X11_LIB_SEARCH_PATH})
@@ -1297,7 +1325,7 @@ if(WITH_BULLET AND WITH_SYSTEM_BULLET)
 		set(WITH_BULLET OFF)
 	endif()
 else()
-	set(BULLET_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/extern/bullet2/src")
+	set(BULLET_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/extern/bullet/src")
 	# set(BULLET_LIBRARIES "")
 endif()
 
@@ -1768,7 +1796,9 @@ if(FIRST_RUN)
 
 	info_cfg_text("Build Options:")
 	info_cfg_option(WITH_GAMEENGINE)
+	info_cfg_option(WITH_GAMEENGINE_SECURITY)
 	info_cfg_option(WITH_PLAYER)
+	info_cfg_option(WITH_GAMEENGINE_GPU_SYNC)
 	info_cfg_option(WITH_BULLET)
 	info_cfg_option(WITH_IK_SOLVER)
 	info_cfg_option(WITH_IK_ITASC)
@@ -1793,6 +1823,7 @@ if(FIRST_RUN)
 	info_cfg_option(WITH_X11_XF86VMODE)
 	info_cfg_option(WITH_X11_XFIXES)
 	info_cfg_option(WITH_X11_XINPUT)
+	info_cfg_option(WITH_X11_XINERAMA)
 	info_cfg_option(WITH_MEM_JEMALLOC)
 	info_cfg_option(WITH_MEM_VALGRIND)
 	info_cfg_option(WITH_SYSTEM_GLEW)

README.md

@@ -0,0 +1,16 @@
+# UPBGE
+
+UPBGE (Uchronia Project Blender Game Engine) is a fork of Blender created by Porteries Tristan (a Blender Game Engine developer) and some of his friends in September 2015.
+
+It's an independent branch, and its aim is to clean up and improve current BGE code, experiment with new features, and implement forgotten features that currently exist but have not been merged with the official Blender trunk.
+
+Currently, after the BF's decision to delete BGE from next 2.8 release UPBGE becomes, de facto, the only one to follow the development of BGE. This gives us even more freedom, if possible, to make certain decisions, since we will never, in any way, come into conflict with the official version.
+
+Its development cycle spans the course of 4 months: 3 months to add new features and refactors and 1 months to fix bugs. Then a new release is made available for download (around 3 or 4 per year).
+
+Regularly, the UPBGE merges the official Blender new patches, to stay up-to-date with the last Blender evolutions.
+
+The UPBGE team is composed of volunteers; BGE users who are interested in the game engine development, a web developer, and a communication manager.
+
+## From The Team
+We hope that new users will join the project, to help us test new features, report bugs, provide feedback and ideas to improve UPBGE (https://github.com/UPBGE/blender/issues), and that new developers will join the team to help us develop shiny new features for the game engine.

build_files/cmake/macros.cmake

@@ -530,6 +530,8 @@ function(setup_liblinks
 
 	#target_link_libraries(${target} ${PLATFORM_LINKLIBS} ${CMAKE_DL_LIBS})
 	target_link_libraries(${target} ${PLATFORM_LINKLIBS})
+
+	target_link_libraries(${target} ${TBB_LIBRARIES})
 endfunction()
 
 
@@ -607,6 +609,24 @@ function(SETUP_BLENDER_SORTED_LIBS)
 		bf_editor_mask
 		bf_editor_io
 
+		ge_blen_routines
+		ge_launcher
+		ge_blen_routines
+		ge_logic_ketsji
+		ge_converter
+		ge_phys_dummy
+		ge_phys_bullet
+		ge_logic_ketsji
+		ge_logic
+		ge_device
+		ge_rasterizer
+		ge_oglrasterizer
+		ge_common
+		ge_logic_expressions
+		ge_scenegraph
+		ge_logic_network
+		ge_videotex
+
 		bf_render
 		bf_python
 		bf_python_ext
@@ -623,65 +643,52 @@ function(SETUP_BLENDER_SORTED_LIBS)
 		bf_physics
 		bf_nodes
 		bf_rna
+		bf_dna
 		bf_imbuf
 		bf_blenlib
 		bf_depsgraph
-		bf_intern_ghost
-		bf_intern_string
 		bf_avi
 		bf_imbuf_cineon
 		bf_imbuf_openexr
 		bf_imbuf_openimageio
 		bf_imbuf_dds
 		bf_collada
+		bf_blenfont
+		bf_blentranslation
+
+		bf_intern_ghost
+		bf_intern_string
+		bf_intern_audaspace
+		bf_intern_mikktspace
+		bf_intern_dualcon
+		bf_intern_cycles
 		bf_intern_elbeem
 		bf_intern_memutil
 		bf_intern_guardedalloc
 		bf_intern_ctr
 		bf_intern_utfconv
-		ge_blen_routines
-		ge_converter
-		ge_phys_dummy
-		ge_phys_bullet
 		bf_intern_smoke
+		bf_intern_opencolorio
+		bf_intern_eigen
+		bf_intern_libmv
+		bf_intern_glew_mx
+		bf_intern_clog
+
 		extern_lzma
 		extern_curve_fit_nd
-		ge_logic_ketsji
 		extern_recastnavigation
-		ge_logic
-		ge_rasterizer
-		ge_oglrasterizer
-		ge_logic_expressions
-		ge_scenegraph
-		ge_logic_network
-		ge_logic_ngnetwork
-		ge_logic_loopbacknetwork
-		bf_intern_moto
 		extern_openjpeg
-		ge_videotex
-		bf_dna
-		bf_blenfont
-		bf_blentranslation
-		bf_intern_audaspace
-		bf_intern_mikktspace
-		bf_intern_dualcon
-		bf_intern_cycles
+		extern_rangetree
+		extern_wcwidth
+		extern_sdlew
+
 		cycles_render
 		cycles_graph
 		cycles_bvh
 		cycles_device
 		cycles_kernel
 		cycles_util
 		cycles_subd
-		bf_intern_opencolorio
-		bf_intern_eigen
-		extern_rangetree
-		extern_wcwidth
-		bf_intern_libmv
-		extern_sdlew
-
-		bf_intern_glew_mx
-		bf_intern_clog
 	)
 
 	if(NOT WITH_SYSTEM_GLOG)
@@ -747,13 +754,17 @@ function(SETUP_BLENDER_SORTED_LIBS)
 	endif()
 
 	if(WITH_BULLET AND NOT WITH_SYSTEM_BULLET)
-		list_insert_after(BLENDER_SORTED_LIBS "ge_logic_ngnetwork" "extern_bullet")
+		list(APPEND BLENDER_SORTED_LIBS extern_bullet)
 	endif()
 
 	if(WITH_GAMEENGINE_DECKLINK)
 		list(APPEND BLENDER_SORTED_LIBS bf_intern_decklink)
 	endif()
 
+	if(WITH_GAMEENGINE_BPPLAYER)
+		list(APPEND BLENDER_SORTED_LIBS bf_intern_spindle)
+	endif()
+
 	if(WIN32)
 		list(APPEND BLENDER_SORTED_LIBS bf_intern_gpudirect)
 	endif()

build_files/cmake/platform/platform_apple.cmake

@@ -327,6 +327,11 @@ if(WITH_OPENVDB)
 	set(OPENVDB_DEFINITIONS)
 endif()
 
+if(WITH_GAMEENGINE)
+	set(TBB_LIBRARIES ${LIBDIR}/tbb/lib/libtbb.a)
+	set(TBB_INCLUDE_DIR ${LIBDIR}/tbb/include)
+endif()
+
 if(WITH_LLVM)
 	set(LLVM_ROOT_DIR ${LIBDIR}/llvm)
 	set(LLVM_VERSION 3.4)

build_files/cmake/platform/platform_unix.cmake

@@ -48,6 +48,7 @@ find_package_wrapper(JPEG REQUIRED)
 find_package_wrapper(PNG REQUIRED)
 find_package_wrapper(ZLIB REQUIRED)
 find_package_wrapper(Freetype REQUIRED)
+find_package_wrapper(TBB REQUIRED)
 
 if(WITH_LZO AND WITH_SYSTEM_LZO)
 	find_package_wrapper(LZO)

build_files/cmake/platform/platform_win32.cmake

@@ -522,6 +522,11 @@ if(WITH_SDL)
 	set(SDL_LIBRARY ${SDL_LIBPATH}/SDL2.lib)
 endif()
 
+if(WITH_GAMEENGINE)
+	set(TBB_LIBRARIES optimized ${LIBDIR}/tbb/lib/tbb.lib debug ${LIBDIR}/tbb/lib/tbb_debug.lib)
+	set(TBB_INCLUDE_DIR ${LIBDIR}/tbb/include)
+endif()
+
 # Audio IO
 if(WITH_SYSTEM_AUDASPACE)
 	set(AUDASPACE_INCLUDE_DIRS ${LIBDIR}/audaspace/include/audaspace)